Remove config files from git
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/tmp_cfg/console.php
	protected/tmp_cfg/main.php
	protected/tmp_cfg/test.php