Merge origin/master

Partial commit

Conflicts:
	app/apps/keep-notes/js/controllers/keep-note-controller.js
	app/apps/keep-notes/partials/main.html
	app/apps/keep-notes/scss/notes.scss
	app/css/apps/keep-notes/scss/notes.css
	nbproject/project.properties
Merge branch 'master' of https://github.com/Intermesh/intermesh-angular-example

Conflicts:
	app/modules/keep-notes/js/controllers/keep-note-controller.js
	app/modules/keep-notes/partials/main.html
Merge branch 'master' of https://github.com/Intermesh/intermesh-angular-example

Conflicts:
	app/modules/keep-notes/js/controllers/keep-note-controller.js
	app/modules/keep-notes/partials/main.html