Broadcast state saved
add new icons
small fix in stepservice notification
Merge branch 'master' into save_gamestate
correctly handle stepcount on dashboard restart
remove settings option (add to TODO)
add more TODOs, clean up unused code
Fix broadcastreceiver bug on dashboard
Merge branch 'master' into battle

Conflicts:
	Stepventure/src/main/java/com/threekings/stepventure/MainActivity.java