Update styles to use Sherlock for api > 14
Add synchronized lock for dbhelper
Add tryParseInt for DisplaySettings, Update key for load novel task
Add null check
Launch main activity when ending update history activity if called from update service
Merge remote-tracking branch 'upstream/master'