Merge branch 'master' of http://github.com/rami1942/fxc
Merge branch 'dev'
Merge branch 'dev'