Added grunt support.

Signed-off-by: Luke.Xuan <aoser97@gmail.com>
Merge branch 'develop' into manager