Preliminary steps to making it live
Merge branch 'master' of github.com:allwinpb/Project-Obito

Conflicts:
	web_server/web_server/settings.pyc
settings.py changed to reflect server profile