Signed-off-by: yangjun1985 <gdiyang@lode>
Merge branch 'master' of https://github.com/sgewuhan/vision.git

Conflicts:
	com.mobnut.portal/src/com/mobnut/portal/user/UserSessionContext.java

Signed-off-by: yangjun1985 <gdiyang@lode>