Added notifyjs support
Fix notifyjs
Fix notifyjs
sync develop with local dev
Merge remote-tracking branch 'jerbob92/master' into develop-test

Conflicts:
	js/app.js