changes in url of images link
conflict resolved
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