Erdem
Merge branch 'master' of https://github.com/emrekoc/gitweb

Conflicts:
	blog/protected/controllers/SiteController.php