Cleaning
Merge branch 'master' of git@github.com:m-corden/ActivePT.git

Conflicts:
	ActivePT/activity_gallery.xml