Fix Inheritance Hierarchy

[ptsouchlos]

Currently there isn't really a good inhertiance tree in the library (i.e base classes like the BaseToolbarActivity aren't being reused. This needs to be fixed for the next release so that code re-use is at a maximum.