Show users who have yet to claim a locker
Updated email copy
Merge branch 'master' of github.com:EESoc/eesoc-website
Added terms and conds as separate file for existing owners, and in to the email they automatically receive upon purchase
Merge conflicts resolved