"show others" now shows the proper per-procedure wait time if applicable
Missed properly resetting a variable
Merge branch 'refs/heads/cedar' into expansion

Conflicts:
	app/assets/javascripts/frasernw-filter.js
Missed the new 'label' and 'input' class / names on 'more…' filters
Merge branch 'refs/heads/cedar' into expansion

Conflicts:
	app/views/specializations/show.html.haml
Show a notice explaining wait time column for per-procedure wait times
Merge branch 'refs/heads/cedar' into expansion

Conflicts:
	app/views/specializations/show.html.haml
Typo
Specialist display of custom wait times
Merge branch 'refs/heads/cedar' into expansion

Conflicts:
	app/views/specializations/show.html.haml
Area of practice pages with custom wait times filter appropriately
Merge branch 'refs/heads/cedar' into expansion

Conflicts:
	app/assets/javascripts/frasernw-filter.js
	app/views/procedures/show.html.haml
Make global 'resources' menu that categories can go in
Tweaks to how featured content displays
More tweaks to front page featured display
Merge branch 'refs/heads/cedar' into expansion

Conflicts:
	app/views/layouts/application.html.haml
Cleaning up admin 'in progress' views
Merge branch 'refs/heads/cedar' into expansion

Conflicts:
	app/views/clinics/index.html.haml
	app/views/specialists/index.html.haml
Upgrade rails to 3.1.10
adding missing variable