Controller::flash() is deprecated. Change to SessionComponent::setFlash

- Redirect back to original (referer) page
Merge branch '1.6-contacts' into 1.6