New mock up and button icons
Merge branch 'master' of https://github.com/PeaceCorps/malaria-app-ios