logic refactor, pieces of code moved to more apropriate palces
Merge branch 'master' of github.com:zbicin/gobreak-www

Conflicts:
	js/Controller.js
Merge branch 'master' of github.com:zbicin/gobreak-www

Conflicts:
	js/Controller.js