Added gui stuff.
Some updates
Merge branch 'master' into ponbranch
Merge branch 'master' of https://github.com/jameshcc/SonyHackathon2013