moved js to new popup file in /js
fixed cycles
final submit
Merge branch 'master' into gh-pages