jshint
Merge branch 'master' into feature_masterdetail (jshint)