notifications ui stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/data/u2/notification.json