Merge branch 'master' into sampleApp
jshint via grunt
Merge pull request #35 from Trott/sampleApp

Sample app