Merge branch 'hotfix-4.2.3'
fixed login bug for admins with no assignments
Merge branch 'hotfix-4.2.4'
fixed bug in answer template
added admin column to users#index
added admins to responses#edit user dropdown (closes #705)
fixed form wrapping (closes #858)
disabled link following on index table checkbox columns (closes #851)
fixed bug with std form report headers (closes #839)
tidy
fixed print margins and login instructions title for create multiple users (closes #833)
disabled index table row link following if click target is input (closes #886)
removed activerecord::base from question type
reorganized js folder; restricted grouped tally report col header question types (closes #877)
fixed questioning initialization to include mission (closes #831)
ensured condition params get stripped if empty
fixed i18n argument error in condition model (closes #894)
Merge branch 'master' into develop