fixed compilation tests and upgraded ext. tests branch

test/libsolidity/SolidityOptimizer.cpp

@@ -346,9 +346,9 @@ BOOST_AUTO_TEST_CASE(incorrect_storage_access_bug)
 			mapping(uint => uint) data;
 			function f() public returns (uint)
 			{
-				if (data[now] == 0)
+				if (data[block.timestamp] == 0)
 					data[uint(-7)] = 5;
-				return data[now];
+				return data[block.timestamp];
 			}
 		}
 	)";