changes for join
merged branch into code

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/management/commands/filldb.py
	gnowsys-ndf/gnowsys_ndf/ndf/models.py
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/base.html
	gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py
	gnowsys-ndf/gnowsys_ndf/ndf/views/methods.py
Merge pull request #44 from Dhiru/mongokit

Addition of video module
name increment of file when multiple upload and filldb script rewritten to remove error
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge pull request #45 from krishna31/mongokit

filename increament and filldb script rewriten to solve error
changes
Two Base templates created for node's common fields,
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Added Group join - notification

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/management/commands/filldb.py
Merge pull request #46 from AvadootNachankar/mongokit

Two base templates (for edit/create and display) created for node's common fields
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/display_collection.html
	gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py
updated README.md
modified NUSSD -title with group name
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge pull request #48 from anujag/mongokit

Group title display -modified and INSTALL file modified
modification in video module
Merge branch 'mongokit' of github.com:gnowledge/gstudio into mongokit