fixed camera bounds
merged with orphaned changes on NP machine
merge master and fixResolution of NP machine