added options to set wifi/3g icons - fixes #6
updated before/after
version to 1.0.4
made 3G with an uppercase G
Fix leading '0' for hour in time
Fix missing leading '0' for minute when minute is 9
Merge pull request #8 from Krylez/master

Fix for issue #7 (Display "4:00" instead of "04:00")
added enUS locale
updated before/after
Add navigation bar customization
Switch between status bar and navigation bar + disable preferences when master switch is off, or when dependency required
Use string resources for Preferences keys instead of Strings
Fix color selection + add disabled state for ColourPreference
Fix KitKatGradient dependency
Add more colors
Add specific UK language
Merge branch 'master' of https://github.com/SimonMarquis/clean-status-bar

Conflicts:
	app/src/main/java/com/emmaguy/cleanstatusbar/CleanStatusBarService.java
	app/src/main/java/com/emmaguy/cleanstatusbar/MainActivity.java
	app/src/main/res/values/strings.xml
	app/src/main/res/xml/prefs.xml