Dark theme (res/values/action_bar_style) modified, Manifest: Theme changed to custom theme (set in aforementioned file :p )
Merge remote-tracking branch 'origin/master'