fix camera preview after pausing
output conflicts...no fix
add time/notes fix camera
Merge branch 'new_master' into search