update old files
Merge branch 'vdanyliv' of github.com:vdanyliv/lv113.ui into vdanyliv

Conflicts:
	app/scripts/models/mark.js
	app/scripts/routes/mark.js
	package.json
Fix router, add view