Get last changes

Get last changes
Merge branch 'master' of https://github.com/spairo/api_sono

Conflicts:
	js/app.js
	js/views/pages/about.html