Bugfixes
Merge branch 'develop'

* develop:
  Bugfixes
Bugfixes
Merge branch 'release/RELEASE_0.3.6'
Allow users to change the internship status
Merge branch 'release/RELEASE_0.3.7'