Merge
Merge branch 'master' of https://github.com/dvalvezon/ultrashare.git

Conflicts:
	ultrashare/src/main/resources/META-INF/persistence.xml