Merge branch 'master' of github.com:appdevdesigns/appdevjs