Notification Colored
Merge branch 'master' of github.com:Oblify/Server

Conflicts:
	oblify-app/Oblify/src/com/groups/model/History.java
	oblify-app/Oblify/src/com/groups/oblify/HistoryActivity.java