Zach Aysan: 42e6301 Merge github.com:jacojoubert/emberui