Added proper tempalte for fluxtream capture
Merge remote-tracking branch 'origin/fluxcap-locaton' into moves-api

Conflicts:
	fluxtream-web/src/main/webapp/js/applications/calendar/facetTemplates.html
Added template for moves-location