added reference to build-control into Gruntfile.js and package.json
Merge branch 'master' of github.com:nicolae-olariu/travis-test