Update in background
Merge branch 'master' of https://github.com/yoharnu/NewOnTV.android

Conflicts:
	src/com/yoharnu/newontv/android/App.java
More merge stuff