Added angular-ui-router and moved content into templates.
Merge branch 'master' into routes

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

Added angular-ui-router and moved content into templates.