dev 07.05.14
Merge remote-tracking branch 'origin/master'

Conflicts:
	index-test.php
dev 07.05.14
Merge branch 'master' of https://github.com/alex-76/www
dev 07.05.14
dev 07.05.14
Merge branch 'dev'

Conflicts:
	protected/views/site/contact.php
dev 07.05.14