To pull
Merge branch 'master' of https://github.com/maninsoft/RiceInterface.git

Conflicts:
	src/net/smartworks/rice/mapper/ReportMapper.xml
Commit to pull
Test Report Completed