Merge pull request #1812 from vhpoet/develop

[TASK] 404: Get rid of unneeded dependencies
[TASK] minimize rootScope usage in controllers