Added location element to form
Merge branch 'master' of https://github.com/ExCiteS/cm-epicollect