merge
fixed ui
Merge branch 'a-tion' of https://github.com/CloudClown/Flint into beta
FIXED BUG