districts
pwned by git
Merge branch 'master' of https://github.com/htonus/cy.re

Conflicts:
	meta/article.xml
	src/admin/controllers/controllerRealty.class.php
	src/admin/controllers/i18nEditor.class.php
	src/admin/views/_parts/form/flash.tpl.php
	src/admin/views/realty/index.tpl.php
	src/classes/Auto/Business/AutoArticle.class.php
	src/classes/Auto/Business/AutoArticlePicture.class.php
	src/classes/Auto/Business/AutoArticle_i18n.class.php
	src/classes/Auto/Business/AutoNews.class.php
	src/classes/Auto/Business/AutoNewsPicture.class.php
	src/classes/Auto/Business/AutoNews_i18n.class.php
	src/classes/Auto/Business/AutoPerson.class.php
	src/classes/Auto/Business/AutoPicture.class.php
	src/classes/Auto/Business/AutoRealty.class.php
	src/classes/Auto/Business/AutoRealtyPicture.class.php
	src/classes/Auto/DAOs/AutoArticleDAO.class.php
	src/classes/Auto/DAOs/AutoArticlePictureDAO.class.php
	src/classes/Auto/DAOs/AutoArticle_i18nDAO.class.php
	src/classes/Auto/DAOs/AutoNewsDAO.class.php
	src/classes/Auto/DAOs/AutoNewsPictureDAO.class.php
	src/classes/Auto/DAOs/AutoNews_i18nDAO.class.php
	src/classes/Auto/DAOs/AutoPictureDAO.class.php
	src/classes/Auto/DAOs/AutoRealtyPictureDAO.class.php
	src/classes/Auto/Proto/AutoProtoArticle.class.php
	src/classes/Auto/Proto/AutoProtoArticlePicture.class.php
	src/classes/Auto/Proto/AutoProtoArticle_i18n.class.php
	src/classes/Auto/Proto/AutoProtoNews.class.php
	src/classes/Auto/Proto/AutoProtoNewsPicture.class.php
	src/classes/Auto/Proto/AutoProtoNews_i18n.class.php
	src/classes/Auto/Proto/AutoProtoPicture.class.php
	src/classes/Auto/Proto/AutoProtoRealty.class.php
	src/classes/Auto/Proto/AutoProtoRealtyPicture.class.php
	src/classes/Auto/schema.php
	src/classes/DAOs/i18nDAO.class.php
	src/user/webroot/css/main.css
	src/user/webroot/index.php