fixed this branch, There were files missing from dev 1.2
added files?
added files?
fixed merge issues