OneConnectionDataSourceProvider was added
Merge branch 'Development'

Conflicts:
	app/com/shopservice/Services.java
conn poll was changed to the apache dbcp
one conn pool