We need json on heroku
Port last controller
Use devise path instead of ae_users path for logout
Duh
Fix login/logout links
Fix error when searching based on tags
Fix bad HTML output when editing question options
Validate uniquness of special field purposes by constraint rather than Ruby validation, because the Ruby validation is barfing when cloning a questionnaire
Merge branch 'master' into rails3

Conflicts:
	Gemfile
	Gemfile.lock