[IM] Migration changes
[IM] Comments
[HK] Merge conflict
[BF] Updating code for newest chosen library
Merge branch 'nf-combined_javascript' of https://github.com/opensolutions/OSS-Framework into nf-combined_javascript
[IM] This breaks IE
Merge branch 'nf-combined_javascript'