Merge pull request #3 from mrstocks/master

Updating
Updated Flat-UI-Master
Merge pull request #36 from najela/master

Merge pull request #3 from mrstocks/master
Merge pull request #4 from najela/wip

Wip
Why not
Merge pull request #37 from najela/master

Merge pull request #4 from najela/wip
Merge pull request #6 from mrstocks/master

update