Init commit

Init commit
Backup commit

Backup commit
Backup commit

Backup commit
Merge branch 'master' into consoleCopy#805

Conflicts:
	protected/views/layouts/main.php
Backup commit

Backup commit
Merge branch 'master' into consoleCopy#805

Conflicts:
	protected/views/layouts/main.php
Done task

Done task
Refactor

Refactor
Refactor

Refactor