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

Conflicts:
	RasmusTest/DBTestNy/DBTestNy.userprefs