Android stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/test_screen.unity
Merge branch 'master' of https://github.com/Kvikal/Matprac_2