refs #2014-08-25
refs #update 2014-0826
refs #2014-08-27
refs #2014-08-27
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	src/main/java/my/gov/skmm/sems/web/VoucherController.java
	src/main/webapp/WEB-INF/views/vouchers/findVouchersByIcNumberEqualsOrVoucherNumberEquals.jspx