* upstream merge
* Fixed bad merge
* More bad merges
* Mostly done, however a few properties missing and tests remain.
* async icons loading
* Left button
* Whoops!
* Added button size
* updated docs
* refactor
* Rebase fixes
* Rebase fixes
* rebase fix
* Rebase fixes
* rebase fixes
* reset contributing