Update qe
Merge branch 'master' into rails4merge

Conflicts:
	vendor/plugins/questionnaire_engine