Icons for notifcation
Merge remote-tracking branch 'origin/master'

Conflicts:

	Android/Circa/mobile/src/main/java/com/circa/hackzurich/circa/PushService.java