a added
Merge remote-tracking branch 'remotes/origin/master' into vitalii
mustdie changes
renewed model
new functionality in gameactivity
Merge remote-tracking branch 'remotes/originHat/vitalii' into simon

Conflicts:
	.idea/workspace.xml
	AndroidHat.iml
	gen/com/alperovichsimon/BuildConfig.java
	gen/com/alperovichsimon/R.java
remove after merge