rename activities appropriately
testing how to identify userId
Merge remote-tracking branch 'upstream/master' into improveMain
Fixed going backwards in the funnel. Now correctly undoes changes.

Had to add scrollview back to some activities so that I could see all
the buttons (why was that removed?)

Right now the activities generally don't remember their state when you
go back to them. The exception is the logo activity, since the chosen
logo is stored in the ad manager and can be retrieved without having to
be picked again.
Merge pull request #109 from elihart/prevStageFix

Fixed going backwards in the funnel. Now correctly undoes changes.
Merge remote-tracking branch 'upstream/master' into improveMain
Basic progress view working for crop activity
Mostly working except for logo activity
start work on showing most popular ads
Properly display progress bar at bottom of all the pages
Deleted unused file
Merge pull request #113 from benrudolph/custom-bottom-bar

Custom bottom bar
Fixed bugs with logo and text activity where it crashes if nothing is set
Set JSON parser to turn string into JSONArray of company data
Merge pull request #115 from elihart/textActivityFix

Fixed bugs with logo and text activity where it crashes if nothing is se...
List of company names is now created from JSON Parser
Changed logos to use company url from JSON parsed data

Can't really test this yet since no company has a url uploaded on heroku
Mostly working bitmap resize for different screens
Slightly more documentation
Merge pull request #117 from benrudolph/scale-bitmap-density

Scale bitmap based on density of screen