started updating doctrine config
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	private/modules/Alicephp/Data/DatabaseConnection.php
Merge remote-tracking branch 'origin/develop' into develop