Merge origin/hepoblet

Conflicts:
	.htaccess
	css/bg.gif
	index.php
	protected/config/main.php
	protected/runtime/application.log
	protected/runtime/gii-1.1.15/ModelCode.php
	protected/views/layouts/main.php
	protected/views/site/contact.php
	protected/views/site/index.php
	protected/views/site/pages/about.php
	protected/views/users/index.php
Merge origin/master

Conflicts:
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

Conflicts:
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

Conflicts:
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

Conflicts:
	nbproject/project.properties
	nbproject/project.xml