from the start... fuck
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/scripts.js
	protected/controllers/SiteController.php
	protected/models/GetDir.php
additionals