Merge origin/master

Conflicts:
	src/java/servlets/ServletArtists.java
	src/java/servlets/ServletUsers.java