local conflict
local changes
wtf
Merge branch 'master' of github.com:FreshyLabs/freshy-mobile
Merge branch 'master' of github.com:FreshyLabs/freshy-mobile
Merge branch 'master' of github.com:FreshyLabs/freshy-mobile
Merge branch 'master' of github.com:FreshyLabs/freshy-mobile
Merge branch 'master' of github.com:FreshyLabs/freshy-mobile
Merge branch 'master' of github.com:FreshyLabs/freshy-mobile
Merge branch 'master' of github.com:FreshyLabs/freshy-mobile
added html5 geolocation
fix order