Changes made by Tsuki Bra (cookie.bra@gmail.com).
Merge branch 'master' of https://github.com/cerealBoxx/App.Point.git
Merge branch 'master' of https://github.com/cerealBoxx/App.Point.git
Changes made by Tsuki Bra (cookie.bra@gmail.com).
Merge branch 'master' of https://github.com/cerealBoxx/App.Point.git

Conflicts:
	App.Point/scripts/view-models/add-note.js