Merge origin/master

Conflicts:
	web/createMusic.xhtml
Merge origin/master

Conflicts:
	src/java/ManageBeans/LoggedUserMb.java
	src/java/ManageBeans/SearchMb.java