macrovalidationrouting
asset refactoring
more refactoring
more refactoring
Merge branch 'master' of https://github.com/codeocelot/config_manager

Conflicts:
	Client/common/angular/app.js
	Client/common/views/layout.jade
changed name of angular app.js