Merge origin/master

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