more ui additions

Signed-off-by: Eshaan Bhalla <eshaan@strumsoft.com>
Merge branch 'master' of https://github.com/fbierhaus/hackathon

Conflicts:
	client/TVNight/AndroidManifest.xml
Merge branch 'master' of https://github.com/fbierhaus/hackathon