Reset after Razor problems
Merge branch 'develop' into HEAD
Updated Nugets
Added Ng nuget, CodeMash2014 importer
Add conference to schedule
Add session via star
Nuget updates
MVC5
Android
Merge branch 'develop' of https://github.com/tekconf/tekconf into develop
Updated to MVC5, updated Nugets
Merge branch 'develop'
merged