delete implemented in file
merge confilict resolve after dhiru's commit
delete implemented for file,image,video
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Implemented delete remove bug for already uploaded files
conflict resolved after avdoot's commimits
changes in url of images link
conflict resolved
change in file.py
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
modification in view of video
code merged in videodashboard file
bug resolved
Merge pull request #55 from krishna31/mongokit

bug resolved

merged a small changes
solved problem of title of file contents special characters and space
Merge branch 'mongokit' of github.com:gnowledge/gstudio into mongokit
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