mac 20140611 12:20
Merge branch 'master' of https://github.com/antoniodecesare/Time2Pay

Conflicts:
	app/app.iml
	app/src/main/java/eu/antoniodecesare/time2pay/app/QueryAddressBook.java
	gradle/wrapper/gradle-wrapper.properties