Merge branch 'johanna_feature'

'johanna_feature'
latest
registration form fix
resolved
ec2 s3
Merge pull request #59 from rgschneider/robert-feature

Robert feature
Merge branch 'master' into Molly-feature
merge fixed