fixing merge issue
Merge branch 'master' of git://github.com/Governance/s-ramp

Conflicts:
	s-ramp-governance/brms/build.xml
Merge pull request #193 from KurtStam/master

fixing merge issue