commit wb 20140820 0920
Merge branch 'master' of https://github.com/flightcom/kudosu.git

Conflicts:
	kudosu/bin/kudosu.apk