bug(ios-build): Resolve merge conflict
refactor(servicesActivities, capture): Move logic to factory
Merge pull request #6 from gjtrowbridge/setup-camera-more

feature(capture.js, servicesActivites.js): Add image uploading to capture.js
style: update tabs icons
style: fix nav bar spacing and capture button
WIP
Merge pull request #7 from jasenlew/beautify

style: adds spacing to capture and activities top and photo