Merge branch Ca 3.4 to master

This branch was used to update the app UI, remove dependency on ActionbarSherlock and fix bugs.