update docs and .jshintrc
Merge branch 'master' of github.com:starandtina/portal