Update nav-pills and create faculty.css.scss to correctly handle course navigation in semester.handlebars
Merge branch 'craig-faculty' of github.com:Gowiem/Sisyphus into craig-faculty
Merge branch 'master' of github.com:Gowiem/Sisyphus into craig-faculty
Comments out 'Project Folder' button, floats other buttons to right side of screen. Updates faculty.css to add margins to bottom of course nav
Fixes git issue #89, disables submit dispute button when reason has not been entered
Fixes issue #89, properly disables submit button on dispute modal when reason has not been entered
Changed button Hover to primaryDark
Merge branch 'master' of https://github.com/Gowiem/Sisyphus
Fix #89, adds blocked tags to dispute assignees
Merge branch 'master' of github.com:Gowiem/Sisyphus
Added [OVERDUE] to overdue tasks, changed color of date tag
Fixed [OVERDUE] state
Merge branch 'craig-faculty' of github.com:Gowiem/Sisyphus
Merge branch 'master' of github.com:Gowiem/Sisyphus
Fixes missing div causing a shitstorm of issues
Adds mock scout project to extra_seed
Change [OVERDUE] & [DISPUTED] tags to red
Merge branch 'master' into flat-ui

Conflicts:
	app/assets/stylesheets/tasks.css.scss