Merge pull request #4 from jsacha/master

Pull Solictation - 13/01
Merge pull request #6 from jpsacha/master

Sync 'master'
Merge pull request #7 from jpsacha/master

Update to ScalaFX 1.0.0-R8 and other minor chages
Merge branch 'upstream/master'