Merge branch 'master' of https://github.com/ITsvetkoFF/KV004

Conflicts:
	frontend/app/controllers/main-controller.js
	frontend/app/controllers/resources.js