adjusted .jshintrc to allow keyword 'Promise'
Merge branch 'master' into feature/112-deprecated-modules