Added initial models structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/settings/local.py