merging dev back into master
repaired merge errors
deleted gen files
merging master to dev again to get rid of unwanted files