Updated dashboard
Merge branch 'master' of https://github.com/dragoon20/IF3038-2013
Updated dashboard

Added modals
Updated dashboard

UI fixes