boom, better user location models and a working map
resolve merge conflict
should read forum not forums
remove terms check from team registrations
terms and conditions
Merge branch 'krish-frontend'