previous updates
older updates
Merge branch 'dev' of https://github.com/qualintitative/egoweb into dev

Conflicts:
	.gitignore
	egowebWebApp/protected/config/main.php.bak
	egowebWebApp/protected/runtime/application.log