Homestyx hydra

R1:09a350682187

Merge branch 'master' into redesign
Repository: R1 hydra
Commit Date: May 29 2014