new jelastic
Merge remote-tracking branch 'origin/master'

Conflicts:
	dao/src/main/resources/applicationContext-dao.xml
	dao/src/main/resources/jelastic.mongodb.properties
new jelastic