增加favorite
Merge branch 'dev_liqian' of https://github.com/liqian008/designer.git
into dev_liqian

Conflicts:
	designer-front/src/main/java/com/bruce/designer/front/controller/UserSettingsController.java
	designer-front/src/main/webapp/WEB-INF/jsp/settings/inbox.jsp
	designer-front/src/main/webapp/WEB-INF/jsp/settings/settingsTabInc.jsp