cleanup, static path changed to dist dir
Merge remote-tracking branch 'origin/master'