setup

setup
small changes

Small changes
Merge branch 'devo' of https://github.com/gunanpop/yiya into devo

Conflicts:
	YIYAWebsite/YIYAWebsite/__init__.pyc
	YIYAWebsite/YIYAWebsite/settings.pyc
	YIYAWebsite/YIYAWebsite/wsgi.pyc
	YIYAWebsite/templates/webmain/Base.html
	YIYAWebsite/webmain/__init__.pyc
	YIYAWebsite/webmain/models.pyc
	YIYAWebsite/webmain/views.py