I want Notification Center
Merge branch 'develop'

* develop:
  I want Notification Center

Conflicts:
	.osx