Logging
v6.0.20
Lollipop support
Merge branch 'master' of github.com:Neamar/notiflow-client

Conflicts:
	app/src/main/AndroidManifest.xml