Make sure the @cms_site exists before trying to access its attributes (was breaking in the sign_in page
Merge branch 'rails' into ec2