Merge branch 'master' of https://github.com/rsteckler/unbounce-android
Merge remote-tracking branch 'remotes/upstream/master'
Merge branch 'master' of https://github.com/rsteckler/unbounce-android
changes:
1. Package Name added for alarms and services
2. bug fix for services for JB
changes:
1. Package Name added for alarms and services
reverting the flag
Merge remote-tracking branch 'remotes/upstream/master'
Merge remote-tracking branch 'remotes/upstream/master'
Merge remote-tracking branch 'remotes/upstream/master'
Merge branch 'release-2.0.4' into develop
Merge branch 'master' of https://github.com/rsteckler/unbounce-android
Merge remote-tracking branch 'remotes/upstream/develop'
Finally package name is working for all alarms, services and wakelocks

1. Thanks to chamonix for betterbattery stats code, it helped me in package name for wakelocks
2. all package name get methods moved to UidNameResolver
3. added package name to wakelocks
Create Chinese Traditional localization 

This is a localization for Chinese Traditional, which is used in Taiwan mainly.
The locale code is zh-rTW.
Merge pull request #93 from justinliao7928/patch-1

Create Chinese Traditional localization
Merge pull request #92 from chhapil/master

Beautiful.  Thank you!
Finally package name for Wakelocks is working
Fixed bug where resetting files caused NPE
Changed action bar color for services.  Better logging on NPE for bad list items
Changed name of assets
More robust file resets