Merge pull request #4 from gmambro/dbms-agnostic

Aligned with master
better performance loading JS at the end
loading JS at the end in popup window