Added google map css.
Added google-maps module.
Fixed controllers to call the right scripts, styles.
Imported Google Map.
Resolved merge conflicts.