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

Conflicts:
	app/src/main/AndroidManifest.xml
Display total number of notification shown to the user
Removed trailing log
Merge pull request #11 from Neamar/stats-screen

Display total number of notification shown to the user
Cleaning up
v7.0.24
Added intent filter for notification
Reorganize preferences
Formatting
Merge branch 'master' of github.com:Neamar/notiflow-client into color

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/fr/neamar/notiflow/GcmIntentService.java
	app/src/main/res/values-v21/styles.xml