Blocknote CRUD in angular
Merge branch 'master' of github.com:albertodotcom/codernotes

Conflicts:
	app/assets/javascripts/controllers/blocknoteCtrl.js
	app/assets/javascripts/services/blocknote.js
	app/controllers/application_controller.rb