Updated angular versions in bower.json. Redid getClinics as webService function
Fixed merge conflict