Homestyx hydra

R1:803c65663d13

Merge branch 'master' into redesign-2015
Repository: R1 hydra
Commit Date: Jun 20 2015