! update
Merge branch 'devel' of https://github.com/MasterCybo/Chronoline into devel

Conflicts:
	ant/auto-version.properties
	bin/chronoline.swf
	src/Main.as
	src/Version.as
	src/display/gui/GridScale.as