Merge origin/master

Conflicts:
	src/net/ipetty/android/discover/MainDiscoverFragment.java