fixed conflicts from pulling recent master
Added google places functionality, using just javascript. Also adjustments to merge with updated master.