Merge branch 'master' of github.com:molgenis/molgenis into feature/bootstrap
Merge branch 'master' of github.com:molgenis/molgenis into feature/bootstrap
Fix for updating JPA forms: Two missing @Transactional attributes made it impossible to edit entities
Merge branch 'master' of github.com:molgenis/molgenis into feature/bootstrap
Placed button html inside view-menumanager.ftl file
Added method to the MenuManagerController to handle logo update requests
Changed MolgenisUi interface to contain static String key values. Added a setHrefLogo method to update the logo in molgenisSettings. Updated all classes implementing the MolgenisUi interface.
Catalog viewer was too wide. adding a max of 12 columns to class fixes this + makes it responsive
Updated advanced options panel in upload wizard
Merge pull request #1832 from Mark-de-Haan/feature/bootstrap

Fixed bug: Couldnt edit or update JPA entities, missing @Transactional attributes. CSS fixes