Merge pull request #21 from rock3r/DroidconUK2013

Continuing work (mostly on the UI)
Merge branch 'mainline/DroidconUK2013'