Updated weather code abit (to stick cityID into DB)
Updated models to change location again