added js bust arg for development
Merge branch 'master' into khan