update weily packages task
refactor  conversation package
Merge branch 'origin/feature-willy-grunt-concat'

Conflicts:
	Gruntfile.js
fix