controller
Merge branch 'master' of https://github.com/codeocelot/config_manager

Conflicts:
	public/app/controllers.js
check in
Merge branch 'master' of https://github.com/codeocelot/config_manager

Conflicts:
	public/app/controllers.js
	public/javascripts/config_managerbundle.js
	public/javascripts/loadbundle.js
Merge branch 'master' of https://github.com/codeocelot/config_manager
Merge branch 'master' of //vmw7x64/Shared_Files/ConfigManager
code cleanupcode cleanupcode cleanupcode cleanupcode cleanupcode cleanupcode cleanupcode cleanupcode cleanup
more refactoring
more refactoring
forgot to include Server/common/routes
forgot to add angular assets to commit
added ref to vmw7x64 instead of localhost
http://vmw7x64
paring down unnecessary assets
Merge branch 'master' of //vmw7x64/Shared_Files/RamKitEthos