Updated gruntfile to automatically copy view files to pocfun directory; updated karma config and version in package.json; added jshintignore file for tests
Untrack local db files
Untrack database files, again. Update .gitignore so that we have to deal with this no more.
Update route so that header links will still work.  Clear distinction between MVC routing and Angular routing.
Update .gitignore to ignore the PocFunWeb/apps directory
Modify route so that it points to the view location within the MVC app.
Merge branch 'mvc-client-host'
Merge branch 'master' of https://github.com/walterpinson/PocFunClient

Conflicts:
	.gitignore
	src/angular/app/scripts/app.js
	src/mvc.net/PocFunWeb/App_Start/RouteConfig.cs
Added new logic for token getting from URL and routing
TA67843 - Implemented new routing with conditional routes based on $location so that AngularJS app can run independently from .Net client solution
Merge pull request #2 from walterpinson/poc-tokenpassing-tm

Merging in Tara's client-side token handling / parsing solution.