Merge branch 'develop' into release-1.0
Merge branch 'release-1.0'
Prevent issue where dublicate pk on insert.
Merge branch 'hotfix-1.0.1'
Be sure there are none dublicates.
Use correct js dir.
Merge pull request #3 from syddjurs/hotfix-1.0.2

Hotfix 1.0.2