Updates
Merge branch 'master' of https://github.com/accelm/Accelerate-Media-Site

Conflicts:
	.htaccess