Merge pull request #10 from lalogf/master

Added modal to login page
corrected locations model
Merge pull request #11 from bamiano/master

corrected locations model
conflicts resolved - view everything favorite working