Activity Recognition
Merge branch 'master' of https://github.com/vijayrajanna/step_up_life

Conflicts:
	res/layout/fragment_reminder.xml