Merge pull request #1 from ercchy/master

There is new Django 1.6 inhere
added basic template pages and removed db
Merge pull request #2 from ialja/master

added basic template pages and removed db
Merge branch 'master' of github.com:codeeu/coding-events into social_login

Conflicts:
	codeweekeu/web/templates/base.html