small UI changes
Merge branch 'master' of https://github.com/nguyenshane/CreativeColors

Conflicts:
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.root/2.tree

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	res/layout/activity_main.xml
	res/values/strings.xml