committing to pull
fixing conflicts
Merge branch 'develop' of https://github.com/soolaimon/mobile_noms into develop
working on this select field thing
Merge branch 'develop' of https://github.com/soolaimon/mobile_noms into develop
pulled develop branch up
fixed nil value <=
pulling down freq locations
frequent location select updates address field
merging develop
changed location stuff to just one full address
merge develop