Navigation 'up' from reference guide keeps same BasicActivity
Merge branch 'issues/2' into dev