Bug fixing
Changed ActionBar Colors
Changed UI
Bug fixing
Merge remote-tracking branch 'origin/dev'