commit for changes pushed to dev today
Merge branch 'master' of github.com:mdchappe/kronosource