Changed Factory to EntityFactory
+ some syntactical updates
Merge remote-tracking branch 'origin/master'
resolved conflicts
deleted unused LandscapePlotViewController