Merge branch 'master' of https://github.com/webasyst/webasyst-framework into master3

Conflicts:
	.htaccess
	wa-apps/contacts/css/contacts.css
	wa-apps/photos/lib/config/photosConfig.class.php
	wa-content/css/wa/wa-1.0.css
	wa-content/xml/wa-app-theme.dtd
	wa-plugins/shipping/courier/locale/en_US/LC_MESSAGES/shipping_courier.po
	wa-plugins/shipping/courier/locale/ru_RU/LC_MESSAGES/shipping_courier.po
	wa-plugins/shipping/flatrate/locale/ru_RU/LC_MESSAGES/shipping_flatrate.po
	wa-system/database/waDbStatement.class.php