Merge branch 'new-notifications' of https://github.com/shadibarhoumi/FeedYourNetwork into brian

Conflicts:
	FeedYourNetwork.html
	FeedYourNetwork.js