Крутяк
ВОРКСПЕЙС_ГУСЬ
Merge branch 'v2.1'

Conflicts:
	.idea/workspace.xml
	app/scripts/controllers/main.js
	app/views/main.html