dev 07.05.14
dev 07.05.14
Merge branch 'dev'

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