Final changes before sumbitting
Merge branch 'master' of https://github.com/iofirag/3Dpaint
 Final changes