contact type shiz
Merge branch 'master' of https://github.com/markfinney/lara

Duplicated a fix
fixed the contacttype and location type *bug*