adapted .htaccess for new hosting

adapted mail sending - local using smtp, remote using mail
Merge branch 'master' into master_new_design

Conflicts:
	app/config/core.php