app
Merge branch 'master' of https://github.com/Pripman/ActioncardAPP

Conflicts:
	AndroidApp/AndroidApp.userprefs