Изменения моделей
Изменения моделей
Merge branch 'master' of https://github.com/vitaly1210/tdagat

Conflicts:
	app_main/__init__.pyc
	app_main/admin.pyc
	app_main/models.pyc
	app_main/templates/app_main/index.html
	app_main/views.pyc
	static/admin/css/base.css
	static/admin/css/changelists.css
	static/admin/css/forms.css
	static/admin/css/login.css
	static/admin/css/widgets.css
	static/admin/js/actions.js
	static/admin/js/actions.min.js
	static/admin/js/admin/DateTimeShortcuts.js
	static/admin/js/calendar.js
	static/admin/js/collapse.js
	static/admin/js/collapse.min.js
	static/admin/js/core.js
	static/admin/js/inlines.js
	static/admin/js/inlines.min.js
	static/admin/js/jquery.init.js
	static/admin/js/jquery.js
	static/admin/js/jquery.min.js
	static/css/agat.css
	static/js/agat.js
	tdagat/__init__.pyc
	tdagat/dashboard.pyc
	tdagat/settings.pyc
	tdagat/urls.pyc
	tdagat/wsgi.pyc