xMerge branch 'master' into remove_prototype

Conflicts:
	vendor/plugins/easy-ckeditor/app/controllers/ckeditor_controller.rb
WIP comment update_pages before ajaxification
Merge branch 'remove_prototype' of github.com:fdv/typo into remove_prototype
Merge branch 'remove_prototype' of github.com:fdv/typo into remove_prototype
Remove scriptaculous lib
Comment prototype expressions