app path change back
Merge branch 'master' of https://github.com/englishtown/CalabashMobileProject
merged
change to _text
add debug code to print cucumber command
remove the debug code for jenkins test
Set a name to allow Cucumber reports to find it
Added short descriptive names to improve cucumber reports
Add check for empty lesson score
Update lesson score due to new content
Update lesson score due to new content (for real)
Updated screenshots
Removed test tag
Make login step a bit DRYer
Update lesson score to match new content
Update screenshots to match UI tweaks
Merge remote-tracking branch 'origin/androidStory'

Conflicts:
	common/MOBILE-004.feature
	common/MOBILE-006.feature
	common/MOBILE-007.feature
	common/MOBILE-017.feature
	common/MOBILE-023.feature
	common/MOBILE-025.feature
	common/MOBILE-032.feature
	common/MOBILE-033.feature
	common/MOBILE-099.feature
	common/MOBILE-124.feature
	common/MOBILE-142.feature
	common/MOBILE-1638.feature
	common/MOBILE-1837.feature
	common/MOBILE-1946.feature
	common/MOBILE-197.feature
	common/MOBILE-233.feature
	common/MOBILE-243.feature
	common/MOBILE-244.feature
	common/MOBILE-252.feature
	common/MOBILE-255.feature
	common/MOBILE-298.feature
	common/MOBILE-312.feature
	common/MOBILE-344.feature
	common/MOBILE-438.feature
	common/MOBILE-608.feature
	common/MOBILE-609.feature
	common/MOBILE-611.feature
	common/MOBILE-645.feature
	common/MOBILE-878.feature
	common/MOBILE-879.feature
	common/MOBILE-880.feature
Merge branch 'androidStory'
Make more feature descriptions show up in cucumber reports (Jenkins)
Make restarting the simulator between scenarios optional (NO_RELAUNCH=1)