Improved grunt file and re-ordered test folders
Merge branch 'feature-76' into develop
Feature #77, reorganized test and added grunt task for run unit test automatically