some attempts to show pdf in browser itself
Merge branch 'mongokit' of http://github.com/gnowledge/gstudio into mongokit-explore-resources
bug fix
conflict resolvec
user dash board view changes
task bug resolved
Merge pull request #776 from supriyasawant/mongokit

Minor change made in browse_resource.py
links other than 'About' & 'Contanct' are disabled in nroer if user not loggedin
Merge pull request #777 from sunnychaudhari/collection

links other than 'About' & 'Contanct' are disabled
data-review: method added to take action on edit
img/ added to gitignore (img folder contains NROER images)
Merge pull request #779 from kedar2a/mongokit

img/ added to gitignore and little modifications in data-review
Conflict resolved with latest pull
Specify django version in requirements.txt (issue #778)
Commented PDF resources showing code for time being
Merge pull request #780 from m-anish/patch-1

Specify django version in requirements.txt (issue #778)
shelf code added
alerts placed for shelf_item add and shelf_item removed
Links of images in Iframe (html resource) disabled
Merge pull request #781 from kedar2a/mongokit

Links of images in Iframe (html resource) disabled