Improved badges, added badges dialog
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	gen/name/bagi/levente/pedometer/R.java
	src/name/bagi/levente/pedometer/StatsPagerAdapter.java
merging
testing stuff
merging