..
Merge branch 'master' of github.com:interactivenotes/inotes

Conflicts:
	app/scripts/providers/NoteModel.js