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
11-28
12-1
12-1

合并