admin stuff
Merge branch 'master' of https://github.com/pvraj/OneDir

Conflicts:
	FileWatch.py
	app/views.py