minor changes in filldb.py
created urls folder and modified apps navigations acccording to groups
commit after resolving conflicts

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/UploadDoc.html
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/base.html
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/file.html
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/gapps_menubar.html
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/group.html
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/page.html
	gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py
	gnowsys-ndf/gnowsys_ndf/ndf/views/file.py
	gnowsys-ndf/gnowsys_ndf/ndf/views/page.py
added urls and resource navigations modified
Additions in url
Merge pull request #36 from anujag/mongokit

Added url folder and resource redirected according to group
PIL issue solved and handeled error related to upload
Minor changes in page save and edit urls
Merge pull request #37 from anujag/mongokit

Minor changes in page save and edit urls
Commit after merg
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Necessary changes in urls and page save & edit
Unwanted files removed.
PIL issue, size included in this commit
Changes regarding Version-history.
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.
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/templates/ndf/display_prior_node.html
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/edit_page.html
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/page.html
	gnowsys-ndf/gnowsys_ndf/ndf/views/page.py