Minor syntax fixes to make grunt happy
Added jasmine-jquery cdn
Initial 'mesh' support
Updated jasmine-jquery path
Moved config/package.json back to root, as there are components such as travis CI that depend on that location
Removed old config/package.json
Updated generic component templates.  Added mock data for appliances
Added capsule view support.  Used underscore template for capsule
Additional logic for empty or undefined TunnelTo attributes
Updated template logic for secure tunnels
Merge branch 'syntax_fixes' into cstewart/containermesh_init

Conflicts:
	js/main.js
	js/routers/router.js
fixed jasmine tests
Merge remote-tracking branch 'phil/master' into syntax_fixes
Removed remaining 'JSON.parse(Common.account....' references
Added default ServicePorts
Updated capsules mock data
some cleanup for code climate
Merge pull request #121 from pjschmidt3/master

Cleanup for code climate
Initial support for grids
Merge branch 'master' into cstewart/containermesh_init