Models...

Change-Id: I31235b87a4af2937a3e05ed8e2f6bd648832fd27
Merge branch 'master' of https://github.com/innospark/PythonWork

Conflicts:
	models.py

Change-Id: Ie0deb93d3b6ce1f1da408d31f27ac6aca4353182