log
Merge branch 'master' of https://github.com/DKdeveloper/Passdroid

Conflicts:
	Passdroid/src/pl/dkdeveloper/passdroid/CategoryActivity.java