Upgrade to latest Plug and add new controller stack
Push error handling to router adapter (to be refactored)
Remove unecessary naming code
Add controller stack tests
Use status code from Plug
Allow guards in new controller stack
Update to latest Plug
Update CHANGELOG
Merge pull request #356 from phoenixframework/jv-before-after-action

Add before_* and after_* to controllers and routers
Socket changes when receiving process messages
Merge pull request #360 from aflatter/socket_state

Socket state can be updated when receiving process messages
Fix Flash docs
Add Flash examples to Readme and alias Flash in all Views
Phoenix.Controller.Flash no longer auto-aliased in Controllers
Merge pull request #362 from gjaldon/flash-docs

Flash docs
Fix errors on phoenix.js client and handle heartbeat messages
Resolve conflicts
Merging
Merge branch 'master' of https://github.com/ankurp/phoenix