Edition
Merge branch 'master' of github.com:NBlackout/BDTheque

Conflicts:
	src/main/webapp/WEB-INF/views/create.jsp