Merge pull request #897 from sylus/feature-wet-v3.1

Add tao + rubik back till ember is ready.
Last major updates till RC2 released.

Signed-off-by: Will <sylus1984@gmail.com>