update to 1/14
Merge branch 'master' of https://github.com/douplus/skill

Conflicts:
	Images/Thumbs.db
	account/account_about.php
	account/account_cowork.php
	account/account_follow.php
	account/account_task.php
	css/notification.css
	img/Thumbs.db
	js/account_task.js
	js/follow.js
	photo/Thumbs.db
	php/follow_layout.php
	php/function.php
	php/get_follow.php
	php/posttask.php
	php/re_showtask.php
	php/retask.php
	php/task_layout.php
	profile/profile_about.php
	profile/profile_follow.php
	profile/profile_rating.php
	profile/profile_task.php
	task/discuss/index.php
	task/task_layout.php