Merge pull request #298 from tdcosta100/mux-non-mod4-resolution

New option: MuxNonMod4Resolution
Delete CustomTabbedPaneUI.java
Add CustomTabbedPaneUI.java again
Manual merge with 4.0.0 branch

Go away, nasty conflicts!
Merge pull request #308 from tdcosta100/accurate-dlna-orgpn-4.0.0

New option: AccurateDLNAOrgPN
Merge remote-tracking branch 'upstream/4.0.0' into sony-xperia-4.0.0