Merge branch 'master' of https://github.com/Iteam1337/iteam-dashboard
Made it work in safari
Merge branch 'chrome-issues'