refs #20141201
refs #20141201
14/11/2014 deploy at SKMM
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	src/main/resources/META-INF/spring/database.properties