so many files changed...
Merge branch 'stacking_activities'

Conflicts:
	src/com/brilliantsquid/crappermapper/BaseActivity.java