Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp

dist/changes-2.0.0

@@ -34,6 +34,8 @@ Editing
    * Fixed auto indent for C style coments
    * Copying text from the editor now supports HTML mime type, preserving
      the syntax highlighting.
+   * Block selection defines a find & replace scope
+   * Added customizable default file encoding (in addition to the project setting)
 
 CodePaster
    * Implemented new protocol of pastebin.com including list functionality