Merge origin/master

Conflicts:
	atus/src/conf/persistence.xml
Merge origin/master