Merge branch 'backend' of github.com:vdanyliv/lv113.ui into backend

Conflicts:
	app/app.rb