loaduploader y layout
Merge branch 'SMASolution-v2' of https://github.com/jmmartinez1985/SMASolution.git