favorites moved to usersController
Merge branch 'develop' of https://github.com/if-050java/ATM_Locator into develop
Merge pull request #114 from DrBAXA/develop

Develop