Changed a lot of things in the keep-notes app
Merge origin/master

Conflicts:
	app/apps/keep-notes/js/controllers/keep-note-edit-controller.js
Merge origin/master

Conflicts:
	app/apps/keep-notes/js/controllers/keep-note-edit-controller.js
Changed css