contextual confirms #572
Merge pull request #585 from concerto/contextual_confirms

contextual confirms, fixes #572
Template Show page edit/delete buttons moved to header
Merge pull request #588 from concerto/template#show_buttons

Template Show page edit/delete buttons moved to header
Interpolate the CONCERTODIR variable by switching to double-quotes.

As a result, we have to escape the PID echo'ing stuff.
Merge branch 'master' of https://github.com/concerto/concerto
Changes per #589
upgrade to rails 3.2.14
start upgrade to devise 3
Merge branch 'devise' of https://github.com/concerto/concerto into devise

* 'devise' of https://github.com/concerto/concerto:
  bump to devise 3

Conflicts:
	Gemfile