last commits
Merge remote-tracking branch 'origin/backend_san' into backend_san

Conflicts:
	public/js/mainAngular.js