benerin dikit
Merge branch 'master' of https://github.com/farahs/Exoticnesia

Conflicts:
	protected/runtime/application.log
	themes/shadow_dancer/views/site/login.php