added location code to edit comment
added a camera but nothing is saved yet.
Merge commit '3bfa4737e1332f7a56e4254f82e59d66c2c5245f' into refmerge
merging branches