UpdateArtist.java && error.jsp added/updated
Merge branch 'demo' of https://github.com/utwente-di/di10.git into demo