Glob for node-sass was wrong.
Add gulp-jade
Move server jade to its own directory
Flatten views a bit.
New directory for server jade files
Use angular-route; add basic route
Add conflict partial
Remove unused css file
Add ConflictCtrl
Merge branch 'feature/conflict-page-rough' into develop