Persistence config
Merge remote-tracking branch 'origin/master'

Conflicts:
	Avaya_Client_Server.iml
	build.gradle