bus resolved in translation
conflict resolved
To fix the node position as like you.
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
group_edit
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge pull request #263 from AvadootNachankar/mongokit

Bug resolved: Now you can edit respective groups (doesn't takes you to 'home' group)
bug in translation module resolved
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Bug resolved in translation module
Due to recent heavy changes in code "make module" function stopped working
done necessory changes in bellow file:
   templates/ndf/course_detail.html
   templates/ndf/node_details_base.html
   views/ajax_views.py
Grpah feature: Shift+click to fix the node position in the graph
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge pull request #265 from RajNN/mongokit

Grpah feature: Shift+click to fix the node position in the graph
changes to commit
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge pull request #264 from krishna31/mongokit

Due to recent heavy changes in code "make module" function stopped working
collection of course put in related_content blockinstead of meta_content block
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit