backup
backup 2014116
Merge branch 'master' of github.com:douplus/skill

Conflicts:
	Images/Thumbs.db
	account/account_cowork.php
	account/cooperation/cooperation.js
	account/cooperation/index.php
	img/Thumbs.db
	photo/Thumbs.db
	php/cooperation.php
	php/cowork.php
	php/function.php
	php/get_task.php
	php/posttask.php
	php/re_showtask.php
	task/addtask.js
	task/discuss/retask.php
	task/retask.js
	task/task_layout.php