issue16 add filter
issue 16 6feng assign task
issue 16 6feng  add instruction
Merge branch 'develop' of https://github.com/kangfengsoft/rollaround.git
into develop

Conflicts:
	protected/controllers/ShelfController.php
add exclude
refs #fang fix bug about get All assign task

if (count ( $numIids ) === 20 || $k === count($assignListTasks)) 
in ShelfService.php
issue16 add filter
issue 16 6feng assign task
issue 16 6feng  add instruction
Merge remote-tracking branch 'origin/develop-exclude' into develop

Conflicts:
	protected/controllers/ShelfController.php
	protected/views/site/assign.php
	protected/views/site/exclude.php