added locations
added reference to address on location. added model tests
added address locales
added view for location fields of address
mearged locations brabch
finished merging locations