delete actionbarshelock
appComap instand of actionbarshelock
Merge branch 'develop'

Conflicts:
	build.gradle