PIL issue solved and handeled error related to upload
Commit after merg
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
PIL issue, size included in this commit
Merge pull request #39 from sunnychaudhari/mongokit

Necessary changes in urls and page save & edit
Merge pull request #40 from krishna31/mongokit

PIL issue solved ,file_size include in model
cleaned up pyc and ~ files in the repo which appeared by mistake
Changes regarding _type implementation and groups-part.
PIL installation updated.
search implemented for file and Image
Merge pull request #42 from AvadootNachankar/mongokit

Changes regarding _type implementation and groups-part
resolve conflict after avdoot commit
search Implemented for Image,Files
Merge pull request #43 from krishna31/mongokit

Search Implement for Image,Files
Addition of video module
merged conflict in INSTALL file
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