changes in url of images link
conflict resolved
Merge pull request #53 from anujag/mongokit

change in file.py
Added feture
1)created page for video,image
2)edit feture added for video,image
3)now on words download will be downloaded as filename with extension not as id
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/views/file.py
conflict resolved
bug resolved
Merge pull request #55 from krishna31/mongokit

bug resolved

merged a small changes
added forum app
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py
	gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py
	gnowsys-ndf/gnowsys_ndf/ndf/views/group.py