angular.module + .jshintrc
fix merge