commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	portal/iparty/src/main/resources/iparty-processor.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	portal/iparty/src/main/resources/iparty-processor.xml