Update db according to milestone
Updated .htaccess
Merge branch 'master' into release

Conflicts:
	src/.htaccess