Merge pull request #1 from klrkdekira/master

Pull from upstream
Merge pull request #2 from klrkdekira/master

Billwatcher New UI
Merge pull request #3 from klrkdekira/master

Merged updates from upstream
Merge pull request #4 from klrkdekira/master

Merge updates from upstream
Merge pull request #7 from Sinar/master

Merged from upstream