Merge branch 'dev' into styleUserDashboard
Make pointer appear over alert boxes
Change welcome alert padding to keep text on two lines for smaller screens
Merge branch 'styleUserDashboard' into dev