Add error notification
Fix the alert classes
Merge branch 'master' into heroku