review
Fixed Tests app
added merging exclusion for Generator project
Merged review branch to master