ignoring things
Merge branch 'refs/heads/3.0/develop' into 3.0/production

Conflicts:
	.htaccess
fixing
Merge branch 'refs/heads/3.0/develop' into 3.0/production
Merge branch 'refs/heads/3.0/develop' into 3.0/production
Merge branch 'refs/heads/3.0/develop' into 3.0/production
Merge branch 'refs/heads/3.0/develop' into 3.0/production
Merge branch 'refs/heads/3.0/develop' into 3.0/production
Merge branch 'refs/heads/3.0/develop' into 3.0/production
Merge branch 'refs/heads/3.0/develop' into 3.0/production
Added optional description that grabs from lang, if exits
Sets a description, if one exists, to send to blank_section