add activitymodel
Merge branch 'master' of github.com:hyrtyp/app

Conflicts:
	src/main/AndroidManifest.xml