Improved security by checking whether or not a user is logged in from the BaseActivity
Reverted previous commit, placing the security check in the BaseActivity class didn't seem to work.
Fixed merge conflict