Added ID's to Flash and Errors
Added flash checks to rspec
Merge branch 'develop'