Merge branch 'Adding_users'
Merge branch 'Adding_users'
Merge branch 'Working_branch'
fix for google app engine remote
Merge branch 'Working_branch'
Merge branch 'Working_branch'
Merge branch 'Working_branch'
strip_html from inputs + selenium tests
Revert "strip_html from inputs + selenium tests"

This reverts commit 2e4b483f92c8391edd7223c71350f7caf1087940.
Revert "Revert "strip_html from inputs + selenium tests""

This reverts commit bf95610f98cf9b5fd264952f23840fce901c9562.