change for colour and testing user password
Merge branch 'refs/heads/dev' into online

Conflicts:
	.actionScriptProperties