settings screen made
Merge branch 'master' of github.com:campus-march-2014/GitterAndroid

Conflicts:
	bin/GitterApp.apk
	bin/classes.dex
	bin/resources.ap_