diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index 0cf4a78d84..8473e22cd4 100644
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -115,7 +115,7 @@ Format 5
 #bind "F1"			"help"			# Not yet implemented!
 #bind "C-F1"			"help-context"		# Not yet implemented!
 \bind "F2"			"buffer-write force"
-\bind "F3"			"word-find"
+\bind "F3"			"command-sequence search-string-set; word-find"
 \bind "S-F3"			"word-find-backward"
 \bind "C-F3"			"search-string-set"
 \bind "C-F4"			"buffer-close"
diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 752d478c4e..9304184c03 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -359,7 +359,7 @@ InsetLayout Listings
 	Decoration            minimalistic
 	InheritFont	      false
 	Font
-	  Color               foreground
+	  Color               latex
 	  Family              typewriter
 	EndFont
 	LabelFont
diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index d350c5607c..1fb25bbeeb 100644
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -4934,6 +4934,9 @@ def convert_branch_colors(document):
             break
         # We only support the standard LyX background for now
         k = find_token(document.header, "\\color #faf0e6", i, j)
+        if k != -1:
+           document.header[k] = "\\color background"
+        k = find_token(document.header, "\\color #000000", i, j)
         if k != -1:
             document.header[k] = "\\color background"
         i += 1
diff --git a/lib/scripts/lyxpaperview.py b/lib/scripts/lyxpaperview.py
index 3e40a630d7..cbac441044 100755
--- a/lib/scripts/lyxpaperview.py
+++ b/lib/scripts/lyxpaperview.py
@@ -56,7 +56,25 @@ def find_exe(candidates):
     return None
 
 
+#custom written code to kill second author and kill "van den" from author names
+def handle_args(args):
+    if len(args) < 3:
+        return args
+    if args[1] == 'van':
+        args.pop(1)
+    if len(args) < 2:
+        return args
+    if args[1] == 'den':
+       args.pop(1)
+    #remove 2nd author
+    if len(args) == 3:
+        args.pop(2)
+
+    return args
+
+
 def find(args, path):
+    args = handle_args(args)
     if os.name != 'nt':
         # use locate if possible (faster)
         if find_exe(['locate']):
diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index 3eb37198f4..79a20d25cc 100644
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -48,10 +48,10 @@ Include "stdtoolbars.inc"
 #
 Toolbars
 	"standard" "on,top"
-	"view/update" "on,top"
+	"vcs" "on,top"
+	"view/update" "off,top,samerow"
 	"extra" "on,top,samerow"
 	"review" "auto,review,top"
-	"vcs" "off,top"
 	"table" "auto,table,bottom"
 	"math_panels" "auto,math,bottom"
 	"math" "auto,math,bottom"
diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index ad8571d0ed..484c8c8775 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -540,6 +540,7 @@ Menuset
 		OptItem "Deactivate Branch in Master|v" "branch-master-deactivate"
 		OptItem "Invert Inset|I" "branch-invert"
 		OptItem "Add Unknown Branch|w" "branch-add"
+		OptItem "Sync all|y" "branch-sync-all"
 	End
 
 #
diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 9dd8c8655d..e3fbdd9c76 100644
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -109,6 +109,21 @@ ToolbarSet
 		PopupMenu "toolbar-toggle_review" "Show review toolbar"
 	End
 
+	Toolbar "vcs" "Version Control"
+		Item "Register" "vc-register"
+		Item "Check-out for edit" "vc-check-out"
+		Item "Check-in changes" "vc-check-in"
+		Item "View revision log" "dialog-show vclog"
+		Item "Revert changes" "vc-revert"
+		Item "Compare with older revision" "vc-compare"
+		Item "Compare with last revision" "vc-compare 0"
+		Item "Insert Version Info" "info-insert vcs revision"
+		Separator
+		Item "Use SVN file locking property" "vc-locking-toggle"
+		Separator
+		Item "Update local directory from repository" "vc-repo-update"
+	End
+
 	Toolbar "view/update" "View/Update"
 		Item "View" "buffer-view"
 		Item "Update" "buffer-update"
@@ -122,35 +137,20 @@ ToolbarSet
 	End
 
 	Toolbar "extra" "Extra"
-		Item "Default" "layout"
-		BidiItem "Numbered list" "layout-toggle Enumerate"
-		BidiItem "Itemized list" "layout-toggle Itemize"
-		BidiItem "Labeled List" "layout-toggle Labeling"
-		BidiItem "Description" "layout-toggle Description"
-		BidiItem "Section" "layout-toggle Section"
 		BidiItem "Increase depth" "command-alternatives outline-in;depth-increment"
 		BidiItem "Decrease depth" "command-alternatives outline-out;depth-decrement"
 		Separator
-		Item "Insert figure float" "float-insert figure"
-		Item "Insert table float" "float-insert table"
+		Item "Align center" "paragraph-params \align center"
+		Item "Smaller font size" "textstyle-update size 2"
+		Separator
 		Item "Insert label" "label-insert"
 		Item "Insert cross-reference" "dialog-show-new-inset ref"
 		Item "Insert citation" "dialog-show-new-inset citation"
-		Item "Insert index entry" "index-insert"
-		Item "Insert nomenclature entry" "nomencl-insert"
 		Separator
-		Item "Insert footnote" "footnote-insert"
-		Item "Insert margin note" "marginalnote-insert"
 		Item "Insert LyX note" "note-insert"
-		Item "Insert box" "box-insert Frameless"
-		Item "Insert hyperlink" "href-insert"
-		Item "Insert TeX code" "ert-insert"
-		Item "Insert math macro" "math-macro newmacroname newcommand"
-		Item "Include file" "dialog-show-new-inset include"
 		Separator
 		Item "Text properties" "dialog-show character"
 		Item "Paragraph settings" "layout-paragraph"
-		Item "Thesaurus" "thesaurus-entry"
 	End
 
 	Toolbar "table" "Table"
@@ -341,21 +341,6 @@ ToolbarSet
 #		ExportFormats
 #	End
 
-	Toolbar "vcs" "Version Control"
-		Item "Register" "vc-register"
-		Item "Check-out for edit" "vc-check-out"
-		Item "Check-in changes" "vc-check-in"
-		Item "View revision log" "dialog-show vclog"
-		Item "Revert changes" "vc-revert"
-		Item "Compare with older revision" "vc-compare"
-		Item "Compare with last revision" "vc-compare 0"
-		Item "Insert Version Info" "info-insert vcs revision"
-		Separator
-		Item "Use SVN file locking property" "vc-locking-toggle"
-		Separator
-		Item "Update local directory from repository" "vc-repo-update"
-	End
-
 	Toolbar "functions" "Functions"
 		Item "arccos" "math-insert \arccos"
 		Item "arcsin" "math-insert \arcsin"
diff --git a/src/Format.cpp b/src/Format.cpp
index 89264c6177..bf21943575 100644
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -625,6 +625,27 @@ void Formats::setEditor(string const & name, string const & command)
 }
 
 
+bool Formats::viewURL(docstring const & url) {
+	Format const * format = getFormat("html");
+	if (!format)
+		return false;
+
+	string command = commandPrep(format->viewer());
+
+	if (!contains(command, token_from_format))
+		command += ' ' + token_from_format;
+	command = subst(command, token_from_format, quoteName(to_utf8(url)));
+
+	LYXERR(Debug::FILES, "Executing command: " << command);
+
+	Systemcall one;
+	one.startscript(Systemcall::DontWait, command);
+
+	// we can't report any sort of error, since we aren't waiting
+	return true;
+}
+
+
 bool Formats::view(Buffer const & buffer, FileName const & filename,
 		   string const & format_name) const
 {
diff --git a/src/Format.h b/src/Format.h
index 0347ee9d84..5b8e0d7ca4 100644
--- a/src/Format.h
+++ b/src/Format.h
@@ -192,6 +192,8 @@ public:
 	void setViewer(std::string const & name, std::string const & command);
 	///
 	void setEditor(std::string const & name, std::string const & command);
+	/// Currently used by hyperlink insets and GuiCitation
+	bool viewURL(docstring const & url);
 	/// View the given file. Buffer used for DVI's paper orientation.
 	bool view(Buffer const & buffer, support::FileName const & filename,
 		  std::string const & format_name) const;
diff --git a/src/frontends/qt/GuiCompleter.cpp b/src/frontends/qt/GuiCompleter.cpp
index 0b640922ca..2a30ad3986 100644
--- a/src/frontends/qt/GuiCompleter.cpp
+++ b/src/frontends/qt/GuiCompleter.cpp
@@ -166,7 +166,7 @@ GuiCompleter::GuiCompleter(GuiWorkArea * gui, QObject * parent)
 	model_ = new GuiCompletionModel(this, 0);
 	setModel(model_);
 	setCompletionMode(QCompleter::PopupCompletion);
-	setCaseSensitivity(Qt::CaseSensitive);
+	setCaseSensitivity(Qt::CaseInsensitive);
 	setWidget(gui_);
 
 	// create the popup
diff --git a/src/frontends/qt/GuiSearch.cpp b/src/frontends/qt/GuiSearch.cpp
index 4ceaff663a..773c2d948f 100644
--- a/src/frontends/qt/GuiSearch.cpp
+++ b/src/frontends/qt/GuiSearch.cpp
@@ -164,6 +164,19 @@ void GuiSearchWidget::keyPressEvent(QKeyEvent * ev)
 	// we catch the key sequences for forward and backwards search
 	if (sym.isOK()) {
 		KeyModifier mod = lyx::q_key_state(ev->modifiers());
+
+        	if (ev->key() == Qt::Key_F3) {
+                	if (mod==0) { //plain F3
+	                    dispatch(FuncRequest(LFUN_SEARCH_STRING_SET, fromqstr(findCO->lineEdit()->text())));
+        	            dispatch(FuncRequest(LFUN_WORD_FIND));
+                	    return;
+	                } else if (mod==4) { //Shift+F3
+        	            dispatch(FuncRequest(LFUN_SEARCH_STRING_SET, fromqstr(findCO->lineEdit()->text())));
+                	    dispatch(FuncRequest(LFUN_WORD_FIND_BACKWARD));
+	                    return;
+        	        }
+	        }
+
 		KeySequence keyseq(&theTopLevelKeymap(), &theTopLevelKeymap());
 		FuncRequest fr = keyseq.addkey(sym, mod);
 		if (fr == FuncRequest(LFUN_WORD_FIND_FORWARD)
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index f64c368a59..aa23c81425 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -570,7 +570,7 @@ GuiView::GuiView(int id)
 	: d(*new GuiViewPrivate(this)), id_(id), closing_(false), busy_(0),
 	  command_execute_(false), minibuffer_focus_(false), word_count_enabled_(true),
 	  char_count_enabled_(true),  char_nb_count_enabled_(false),
-	  toolbarsMovable_(false), devel_mode_(false),
+	  toolbarsMovable_(true), devel_mode_(false),
 	  colors_model_(new QStandardItemModel(0, 4, this))
 {
 	connect(this, SIGNAL(bufferViewChanged()),
@@ -1198,7 +1198,7 @@ void GuiView::initToolbar(string const & name)
 	if (visibility & Toolbars::ON)
 		tb->setVisible(true);
 
-	tb->setMovable(false);
+	tb->setMovable(true);
 }
 
 
diff --git a/src/frontends/qt/TocWidget.cpp b/src/frontends/qt/TocWidget.cpp
index ca9ac3f39c..3ae4f8552b 100644
--- a/src/frontends/qt/TocWidget.cpp
+++ b/src/frontends/qt/TocWidget.cpp
@@ -118,6 +118,9 @@ TocWidget::TocWidget(GuiView & gui_view, QWidget * parent)
 	timer_->setSingleShot(true);
 	connect(timer_, SIGNAL(timeout()), this, SLOT(finishUpdateView()));
 
+	activeFilterLA->hide();
+	activeFilterCO->hide();
+
 	init(QString());
 }
 
diff --git a/src/insets/ExternalSupport.cpp b/src/insets/ExternalSupport.cpp
index 5893a5d454..d9cae57ef3 100644
--- a/src/insets/ExternalSupport.cpp
+++ b/src/insets/ExternalSupport.cpp
@@ -50,7 +50,7 @@ Template const * getTemplatePtr(InsetExternalParams const & params)
 
 void editExternal(InsetExternalParams const & params, Buffer const & buffer)
 {
-	theFormats().edit(buffer, params.filename,
+	theFormats().view(buffer, params.filename,
 		theFormats().getFormatFromFile(params.filename));
 }
 
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 46180ceea4..38320ce12e 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -350,7 +350,7 @@ bool findOne(BufferView * bv, docstring const & searchstr,
 	}
 	else if (check_wrap) {
 		bool wrap = auto_wrap;
-		if (!auto_wrap) {
+		if (!auto_wrap&0) {
 			docstring q;
 			if (forward)
 				q = _("End of file reached while searching forward.\n"