add control button
Merge branch 'master' of https://github.com/trnl/appathon

Conflicts:
	apps/com.metrological.app.TVBeat/Contents/Javascript/Views/MainView.js