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

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

Conflicts:
	app/app.rb
Merge remote-tracking branch 'origin/backend' into jasmine

Conflicts:
	app/app.rb
added empty line
Merge pull request #32 from vdanyliv/jasmine

Jasmine