UAT-27 Fix jquery/prototype conflict on admin page
Merge branch 'rc2_dev' of https://github.com/thehyve/transmartApp into rc2_dev