Connected activities via buttons
Merge branch 'master' of https://github.com/Cederman/SVP.git

Conflicts:
	res/layout/activity_main.xml