Merge origin/master

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