moved over to hosted files for development
Merge remote-tracking branch 'origin/master'