Updated client UI
Merge branch 'master' of https://github.com/programmingthomas/neon-2013