new version compare view
intermediate commit
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
version compare merge and revert Done
Merge branch 'mongokit' of git://github.com/makfire/gstudio into makfire-mongokit
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
version_page error resolved
Merge branch 'mongokit' of https://github.com/supriyasawant/gstudio into mongokit
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Added created by field in Marker popup.
MIS-GAPP: Modification regarding url's mapping and display.
Implemented changed urls for Observation App.
Changed popup of Marker - Added textbox for contributor name.
Merge pull request #466 from sunnychaudhari/mongokit

Minor bug removed regarding user profile pic
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge branch 'mongokit' of git://github.com/makfire/gstudio into makfire-mongokit
Merge branch 'makfire-mongokit' into mongokit

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py
	gnowsys-ndf/gnowsys_ndf/ndf/views/methods.py
	gnowsys-ndf/gnowsys_ndf/ndf/views/page.py
redundant code from page_publish method removed
Merge branch 'mongokit' of github.com:gnowledge/gstudio into mongokit

merging mukesh's revert code and compare branches code.
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit