python byte code to be removed
Merge branch 'master' of github.com:yakoub/django_training

Conflicts:
	actors/__init__.pyc
	actors/admin.pyc
	actors/migrations/0001_initial.pyc
	actors/migrations/__init__.pyc
	actors/models.pyc
	article/__init__.pyc
	article/admin.pyc
	article/migrations/0001_initial.pyc
	article/migrations/0002_auto_20141213_1935.pyc
	article/migrations/__init__.pyc
	article/models.pyc
	client/js/articles.js
	django1/__init__.pyc
	django1/settings.pyc
	first/__init__.pyc
	first/admin.pyc
	first/migrations/0001_initial.pyc
	first/migrations/0002_auto_20141103_1548.pyc
	first/migrations/__init__.pyc
	first/models.pyc
fix wrong merge
squash first
squash
map field .