merged with robert
Merged with ation
merge complete:TODO, enhance deisgn of 2d view on top of the camera layer
Merge branch 'jackie'
Merging with Ryan's except MapGuideView
Merge branch 'jackie'
unmerge with Ryan's. Error needs to be fixed
Merge branch 'jackie'
real time messaging on parse works
Merge branch 'jackie'
libs added
Merge branch 'jackie'
remove libs
gitignore update
Modified CameraView.java
merged