Zach Aysan: 4f5f629 Merge branch 'master' of github.com:jacojoubert/emberui