Merge branch 'master' into rnr-form

Conflicts:
	modules/openlmis-web/src/test/javascript/SpecRunner.html