FE tasks - Navigations changes, responsive nav
Merge branch 'develop' of github.com:SolidStateGroup/patientview into develop-ui
FE tasks - Navigations changes, responsive nav
FE tasks - Fix join requests template
Merge branch 'develop' into develop-ui

Conflicts:
	root/webapp/app/views/partials/menus.html
feedback in correct list, NAV ordered by displayOrder, note Issues in menu, Feedback in db
FE tasks - join request status' + dashboard template refactor
Merge branch 'develop-ui' of github.com:SolidStateGroup/patientview into develop-ui

Conflicts:
	root/webapp/app/views/dashboard.html
fix for group customPUT on save
Merge remote-tracking branch 'origin/develop-ui' into develop-ui
revert menu merge issue + button height issue
Merge remote-tracking branch 'origin/develop-ui' into develop-ui
Merge branch 'develop' of github.com:SolidStateGroup/patientview into develop-ui
link description size
Merge remote-tracking branch 'origin/develop-ui' into develop-ui
cleanHtml fix
feedback.js in index
Merge pull request #64 from SolidStateGroup/develop-ui

Develop ui