Added functionality to AdCreationManager to track current stage in funnel and offer methods to go forward or back in the funnel
Pick from image from gallery or take a photo
Documentation
Resolved conflicts
Merge pull request #89 from benrudolph/add-gallery-option

Add gallery option (#88)
Merge branch 'master' of https://github.com/maplesyrup/maple-android into adflow
Fixed layout of main activity
Added crop activity to funnel and started progressing funnel with the nextStage function in the AdCreationManager
Fixed minor bug
Merge pull request #91 from elihart/adflow

Changed AdCreationManager to keep track of which stage we are in and handle going forward or backward in the funnel
Added company tag activity to funnel
Removed NewAdActivity.

Not needed now that we have the pop up dialog when creating a new ad
Modified LogoActivity to work in funnel
Fixed logos to load correctly
Merge pull request #92 from elihart/funnel

Added company tag activity to funnel
fix bug with main activity in pulling user info
start work on tabs for main activity
add files for tabs on main activity
Merge pull request #93 from rpandey1234/master

Fix bug with main activity loading
Basic logo moving view