Stuff on activities
Merge branch 'master' of github.com:DeltaWhy/DroidJam

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml