intermediate commit
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
optimized query for getting videos from wetube
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
separate tab for pandora_video
Merge pull request #317 from Dhiru/mongokit

addition of type_of field into adminDesginer of GSystemtype
Merge pull request #318 from Dhiru/mongokit

changed created_by to modified_by
load json of RTs and ATs via filldb
Example: python manage.py filldb ATs.json
conflict resolve after commit
conflict in filldb.py resolved
adding AttributeTypes,RelationTypes,SystemType by json file
Merge pull request #319 from krishna31/mongokit

 Adding AttributeTypes,RelationTypes,SystemType by json file
separate tab created for pandora video
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
changes in file template
Merge pull request #320 from supriyasawant/mongokit

separate tab created for pandora_video
MetaType added to collection_tuple; and try-catch blocks implemented in Node class's save() function.
Code added to save modified_by and contributors wherever missing.
Merge branch 'mongokit-dev' into mongokit