Error handler implemented
Merge branch 'master' of github.com:godot/pasher

Conflicts:
	app/controllers/orders_controller.rb