Merge branch 'debt' into dev
add location to photo / rename ts & cts

#38
rename ts & cts

closes #38
Merge branch 'photoLocation' into dev
Merge branch 'dev' into debt