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

Conflicts:
	src/net/smartworks/rice/manager/impl/UiManagerImpl.java