Merge branch 'hotfix/add-icons-to-project'

* hotfix/add-icons-to-project:
  Bugfix: Add icons to the project
Bugfix: Studyplan - Improved button script

- Cleaned up the file

Signed-off-by: Kenneth Dahlstrøm <kenneth@keda.no>
Merge branch 'hotfix/fix-study-cataloge-show-more-bug'

* hotfix/fix-study-cataloge-show-more-bug:
  Bugfix: Studyplan - Improved button script
Merge branch 'master' into develop

* master:
  Bugfix: Studyplan - Improved button script
Fixed english study plan bug

Signed-off-by: Kenneth Dahlstrøm <kenneth@keda.no>
Merge branch 'hotfix/fix-english-study-plan'

* hotfix/fix-english-study-plan:
  Fixed english study plan bug
Merge tag 'fix-english-study-plan' into develop

Bugfixed - English studyplan

* tag 'fix-english-study-plan':
  Fixed english study plan bug