Mudança de layout Settings
Merge branch 'master' of https://github.com/TechMobile/UpStopwatch

Conflicts:
	bin/UpStopwatch.apk
	bin/classes.dex
	bin/classes/br/com/upinterativo/upstopwatch/MainStopwatchActivity.class
	bin/resources.ap_