UPDATED: Added activity switchers buttons
Merge branch 'master' of https://github.com/gerardino/spacecoatl

Conflicts:
	app/src/main/res/layout/activity_spacecoatl.xml