* Native Mac, Linux, Windows UIs projects.
Merge branch 'master' of https://github.com/bchavez/SharpFlame.git
Fixes merge conflicts.