added flash:error
Merge branch 'staging' of github.com:rrgayhart/apolloio into staging