Merging 07/26/2014

Update .htaccess