Had to re add this file
don't need this
Top level menu clicks to first menu section
Have to make sure htaccess and htpasswd is ignored!
Merge branch 'refs/heads/3.0/develop' into 3.0/production

Conflicts:
	.htaccess