adding file add and view features
adding file add and view features
addeding file/view add features
Merge branch 'master' of https://github.com/arunenigma/deva

Conflicts:
	.idea/.name
	.idea/modules.xml
	.idea/vcs.xml
	.idea/workspace.xml
	manage.py