Answers can now be permalinked and focused on load (https://trello.com/c/6bSMoDtL/119-permalink-answers)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/application.scss