bla
Merge pull request #261 from Jalle19/patch-2

Same as #260 but for the "develop" branch
Merge pull request #269 from crisu83/develop

Pass iconOptions in TbHtml::menu() to icon() function
Merge pull request #2 from crisu83/master

Update from origin