Revert "11-26/安全设置添加验证，创意商品展示三列适配。。。"

This reverts commit 5873f43274034448e98f09781904506c0f593218.
Merge remote-tracking branch 'origin/pzhyy'
Revert "Revert "11-26/安全设置添加验证，创意商品展示三列适配。。。""

This reverts commit b28683e364b3161b42fd1a4d9dc4d35dbf8f674b.
11-27
Merge remote-tracking branch 'origin/pzhyy'
Merge remote-tracking branch 'origin/pzhyy'
完成商店页面，个人信息修改页面
合并
Merge remote-tracking branch 'origin/pzhyy'
11-28合并

This reverts commit 6173bf1eef54d8f5716c86cf71af8615dc9802eb.

Conflicts:
	angular_sites/index.html
	angular_sites/js/config/config.js
	angular_sites/js/controllers/main.js
	angular_sites/views/idea_sites/idea-item.html
	angular_sites/views/user-setting-list.html