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

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

Conflicts:
	App.Point/scripts/app.js
Changes made by Tsuki Bra (cookie.bra@gmail.com).
Changes made by Tsuki Bra (cookie.bra@gmail.com).
Changes made by Tsuki Bra (cookie.bra@gmail.com).
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
Merge branch 'master' of https://github.com/cerealBoxx/App.Point.git

Conflicts:
	App.Point/scripts/app.js
	App.Point/scripts/view-models/note-details.js
	App.Point/views/main.html
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).