cleaning up some templates... moving js to static directory
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'