Merge pull request #2 from BrightPaul/dev

Hive Timeout Fix
Little CleanUp
Revert to dev state
BadgePlus 1.5

See for more infos at dev branch
Fixed Broadcast issues
Disabled Badge now disables row
Small fixes
Disable Badge and support Row to be string at GiveBadge()