delete,update,done
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/get.php
	admin/index.php
	index.php