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

Conflicts:
	WebContent/jsp/content/community/user_instance_list.jsp

Change-Id: Ie06e0d0e8431d124360bd8a85ee6eac3abfdfb17
Merge branch 'master' of https://github.com/maninsoft/smartworksV3.git