Added geocoder and google map iframe
Added google maps javascript
Added google maps javascript
Fixed conflicts
Merge branch 'ToreyStapleton-master'
Cleaned up merge
Added multiple markers
merged from kheang