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

Conflicts:
	src/main/java/my/gov/skmm/sems/web/OfficialUsedController.java
	src/main/resources/META-INF/spring/database.properties