Homestyx hydra

R1:10ba64e892e2

Merge branch 'master' into redesign-2015
Repository: R1 hydra
Commit Date: Jul 1 2015