Merge branch 'dev' of https://github.com/jobquery-enhance/jobquery-client into dev
Change opportunity/:id--Interested column editable
R16: candidate list defaults to alphabetically sorted
R16: companies list defaults to alphabetically sorted
Merge branch 'dev' of https://github.com/jobquery-enhance/jobquery-client into dev
Merge branch 'dev' into dashboardNotice
Merge with dev
Merge branch 'dev' into userAccountStatusBar
Merge branch 'userAccountStatusBar' into dashboardNotice

Conflicts:
	public/js/users/subroutes/dashboard/templates/dashboard.tpl.html
Align dashboard elements
Change alert boxes color to match
add adminOverride column in admin/subroutes/opportunities/temp
minor change css
deleted email column in admin/subroutes/opportunties/templates/detail
Merge branch 'adminlastmin' into dev
minor change
minor change version 2
Order alerts properly
Merge branch 'dashboardNotice' into dev
Merge branch 'dev' into userAccountStatusBar