Merge branch 'master' of github.com:utwente-di/di10 into admin
artist linked 1st steps
Minor changes to the kunstwerk.jsp look
Merge branch 'admin' of github.com:utwente-di/di10 into admin
titel van kunstwerk.jsp toegevoegd, regressie dat elke keer het eerste artwork werd weergegeven op de detailpagina gefixt
artwork not found
almost done with artworks
Merge branch 'admin' of github.com:utwente-di/di10 into admin
some finishing touches
Minor layout changes to kunstwerk.jsp
Merge branch 'admin' of https://github.com/utwente-di/di10 into admin
changed button text
Merge branch 'admin' of github.com:utwente-di/di10 into admin
Merge branch 'admin' into test