Merge pull request #4 from adeel41/master

minor refactoring, statements converted to protected virtual methods in base controllers
Changed spacing format.  No other changes.
Merge pull request #2 from LiquidThinking/master

pull changes from origin