setup of environment
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team7
eclipse does strange things.
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team7
Merge branch 'forgotPassword'
strange metadata removed
Merge branch 'forgotPassword'
forgot password functionality implemented.
Some minor improvements.
Sorry for the mess with these .metadata commits...
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team7