Added user, location and bubble templates for viewing/editing.
Merge branch 'master' into release/2014.10.26