My first commit
Merge branch 'master' of https://github.com/marton987/emarketing

Conflicts:
	manage.py
Merge branch 'master' of https://github.com/marton987/emarketing
Testing with python anywhere