Revert 1cdcd1f..73abbdc

This rolls back to commit 1cdcd1f3e6f32507e6df8764344e0d2eb7280c71.
Revert 73abbdc..2447b07

This rolls back to commit 73abbdc858792a7e3079a8e11522c585a5d45fee.
Created abstract activity super class for location aware actives