clean up intent handling around steps activity to fix bug where steps activity fails on launch
Merge branch 'master' of https://github.com/urbanlaunchpad/production-tracker

Conflicts:
	Android/NewMarket/bin/NewMarket.apk
	Android/NewMarket/bin/classes.dex
	Android/NewMarket/bin/resources.ap_
	Android/NewMarket/src/com/urbanlaunchpad/newmarket/RunsActivity.java
	Android/NewMarket/src/com/urbanlaunchpad/newmarket/StepsActivity.java
modify gitignore
Merge branch 'master' of https://github.com/urbanlaunchpad/production-tracker
add project.properites to .gitignore
Merge branch 'master' of https://github.com/urbanlaunchpad/production-tracker