notification stuff
notification stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/net/ruggedodyssey/twaffic/ui/MainActivity.java
detail view and start of listview