Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_dbg

mix/CodeModel.cpp

@@ -142,10 +142,12 @@ void CodeModel::runCompilationJob(int _jobId, QString const& _code)
 	auto codeHighlighter = std::make_shared<CodeHighlighter>();
 	codeHighlighter->processSource(source);
 
+	cs.addSource("configUser", R"(contract configUser{function configAddr()constant returns(address a){ return 0xf025d81196b72fba60a1d4dddad12eeb8360d828;}})");
+
 	// run compilation
 	try
 	{
-		cs.setSource(source);
+		cs.addSource("", source);
 		cs.compile(false);
 		codeHighlighter->processAST(cs.getAST());
 		result.reset(new CompilationResult(cs));

mix/qml/html/cm/solidity.js

@@ -12,11 +12,17 @@
 CodeMirror.defineMode("solidity", function(config) {
   var indentUnit = config.indentUnit;
 
-  var keywords = { "delete":true, "break":true, "case":true, "constant":true, "continue":true, "contract":true, "default":true,
+  var keywords = { "address":true, "indexed":true, "event":true, "delete":true, "break":true, "case":true, "constant":true, "continue":true, "contract":true, "default":true,
 		"do":true, "else":true, "is":true, "for":true, "function":true, "if":true, "import":true, "mapping":true, "new":true,
 		"public":true, "private":true, "return":true, "returns":true, "struct":true, "switch":true, "var":true, "while":true,
 		"int":true, "uint":true, "hash":true, "bool":true, "string":true, "string0":true, "text":true, "real":true,
 		"ureal":true,
+
+        "owned":true,
+        "onlyowner":true,
+        "named":true,
+        "mortal":true,
+        "coin":true,
 	};
 
   for (var i = 1; i <= 32; i++) {
@@ -27,7 +33,10 @@ CodeMirror.defineMode("solidity", function(config) {
   };
 
   var atoms = {
-	"true":true, "false":true, "null":true
+    "true":true, "false":true, "null":true,
+      "Config":true,
+      "NameReg":true,
+      "CoinReg":true,
   };
 
   var isOperatorChar = /[+\-*&^%:=<>!|\/]/;