Temporary script fix until angular.js replacement is implemented
Fixed path to scripts
Source vendor.js first
yeoman replaced our favicon. Switched it back
Resolved merge conflict
Fixed favicon again