lint conform
lint conform test rules
integrate grunt
Merge branch 'develop'