set in prog / comp / back to todo
Merge branch 'master' of https://github.com/j2bros/j2brosProject

Conflicts:
	Butler/src/main/java/com/hayate/butler/SelectedActivity.java