merger
Merge branch 'master' of https://github.com/repoproject/ims

Conflicts:
	source/src/com/ims/rule/InOutRule.java
	source/src/reportconfig/report/in.xml
	source/src/reportconfig/report/out.xml