Merge branch 'master' of github.com:hellocreep/trash-box

Conflicts:
	package.json

Signed-off-by: liwen <hellocreep@gmail.com>