Final Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/pl/byd/promand/Team1/ColorChange.java
	src/pl/byd/promand/Team1/MyActivity.java
SettingsActivity Update
Merge remote-tracking branch 'origin/master'