Fix bug with saving to DB
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	htmls/app.html