Merge branch 'master' into develop
for #1068 - force acceptance of TOS on activation
for #1068 - text corrections
add  timestamp fields to rails_admin user list
Merge branch 'develop'