12
Merge branch 'master' of https://github.com/MasterOfDeath/Contacts-Qt

Conflicts:
	Contacts-Qt.pro.user
22.06.2014