Error Alert Notice fixes + post/show fixes
Merge branch 'dev' of github.com:is-valid/ror_team into fix_conflict

Conflicts:
	app/assets/javascripts/messages.js
	app/views/posts/show.html.haml
Merge branch 'fix_conflict' into dev