Homestyx hydra

R1:53ef057b1b51

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