增加一个instagram
删了之前的授权
Merge branch 'master' of https://github.com/tvb-stan/cft-commons-pms.git

Conflicts:
	src/main/webapp/WEB-INF/layouts/left.jsp
	src/main/webapp/WEB-INF/web.xml
instagramDto

Signed-off-by: user <user@10.211.55.3>
instagramController
instagram Jsp
Signed-off-by: user <user@10.211.55.3>
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/cft/commons/pms/web/sweibo/SinaWeiBoController.java
	src/main/java/cft/commons/pms/web/tencent/TencentWeiBoController.java
	src/main/webapp/WEB-INF/jsp/sina/sina_statuses_update.jsp
	src/main/webapp/WEB-INF/jsp/sina/sina_statuses_upload.jsp
	src/main/webapp/WEB-INF/layouts/default.jsp
	src/main/webapp/WEB-INF/web.xml
Signed-off-by: user <user@10.211.55.3>
Signed-off-by: user <user@10.211.55.3>
Signed-off-by: user <user@10.211.55.3>
屏蔽shiro过滤器

Signed-off-by: taurus <xxh0755@gmail.com>
屏蔽shiro相关配置

Signed-off-by: taurus <xxh0755@gmail.com>
去掉shiro标签，修正图标位置

Signed-off-by: taurus <xxh0755@gmail.com>
Signed-off-by: user <user@10.211.55.3>
Merge remote-tracking branch 'origin/master'
增加欢迎页面

Signed-off-by: taurus <xxh0755@gmail.com>
Signed-off-by: taurus <xxh0755@gmail.com>
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'