Updated to work in redmine 2.1.0 (jQuery)
Fix $ redeclaration for Prototype.
Merge remote-tracking branch 'remote/master'

Conflicts:
	assets/javascripts/redmine_close_button.js