Move original identifier pulling from options outside of dummy header block
(cherry picked from commit 1ccd2dcf9e0ea656242268441a9b84e164d11703)
Fix identifier_classes setting in BoardsController#create
bundle update
Use html_safe in flash helper
Batch replace "- form_tag" with "= form_tag"
Fix review helper
Fix diff
Fix Publication#diff_from_canon
Add puma for a multithreaded development server
Merge branch 'master' into rails-3
Switch Repository#add_remote and Repository#fetch_objects from Grit to JGit
jruby-openssl bump, bundle update
Switch XSUGAR_STANDALONE to new config format
Merge branch 'rails-3' into warbler

Conflicts:
	Gemfile
bundle update
Ignore .sass-cache