Merge branch 'hotfix/v1.2.1'
fixing datatables img references
Merge branch 'hotfix/v1.2.2' into develop