Removed double javascript
Removed js already removed by wayf
Merge branch 'develop' into surfnet-version
Reverted change '00006_feature_import_with_missing_fields' since it is not sure if it is still necessary and also it might nog be generic enough