-
-
Merge remote-tracking branch 'remotes/origin/dev-SOA-2-vlad' into dev-SOA-2-vlad

Conflicts:
	v2/css/styles.css
	v2/js/View.js
	v2/templates/leftBar.html