Color change layout added
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.properties
	res/layout/main.xml
	res/values/strings.xml
	src/pl/byd/promand/Team1/MyActivity.java