Toan | Still trying to fix it
Merge branch 'development'
Toan | removed eventtargetbar.js as it was a duplicate and an incomplete js file... wash crashing the site
Merge branch 'development'