Merge branch 'master' into issue_second_page
fix input height to work around chrome bug. Fixes #1253
fix binding on the password modal
display attributes on create security screen in order (fixes #1238)
Merge branch 'issue_second_page'
Merge branch 'captop'
Merge branch 'master' into testing