first changes
fetched forgot-password
small fix
merged develop
reverted some changes
Merge branch 'develop' of https://github.com/hpi-swt2/hpi-hiwi-portal into feature/forgot-password
small changes
fixed tests
reduced controller
fixed some typos
trying to fix last issue
fixed test for travis
fixed tests
Merge branch 'feature/forgot-password' of https://github.com/hpi-swt2/hpi-hiwi-portal into feature/forgot-password
fixed typo
fixed translations
cleaned devise
merged develop
fixed merge
fixed merge2