Added angular-ui-router and moved content into templates.
fix spacing
Added bower install to npm postinstall
Merge branch 'master' into routes

Conflicts:
	dist/index.html
	src/js/dashboard/controllers/master-ctrl.js
Merge pull request #25 from mgoldsborough/npm-postinstall

Added bower install to npm postinstall
Merge pull request #19 from mgoldsborough/routes

Added angular-ui-router and moved content into templates.
Removing old js directory
Merge pull request #30 from mgoldsborough/cleanup

Removing old js directory
Removed dist directory from source control.
Merge pull request #27 from mgoldsborough/remove-dist

Removed dist directory from source control.
Missed some files on the rebase.
Merge pull request #32 from mgoldsborough/remove-dist

Missed some files on the rebase.
update gulpfile to do some watching
Merge branch 'master' of github.com:Ehesp/Responsive-Dashboard