some changes
Merge branch 'master' of https://github.com/intel1993/PartTime

Conflicts:
	Camera/__init__.pyc
	Camera/models.pyc
	FirstApp/settings.py
	FirstApp/settings.pyc