Merge remote-tracking branch 'origin/master'

Conflicts:
	MotivateMe/bin/classes/com/motivateme/MainActivity.class
	MotivateMe/bin/classes/com/motivateme/SetupActivity.class
	MotivateMe/res/layout/fragment_running_data.xml