Merge pull request #3 from bettypoon/master

Adding 4od android client properties files
IOS-59 - add the geo ip URLs to the client properties
Merge pull request #5 from greg-piksel/master

IOS-59 - add the geo ip URLs to the client properties
Merge pull request #6 from bettypoon/master

Add shortformgeoipstatusurl and ensure prod temporarily uses test url
IOS-847 Add hls ad profiles to client properties
Revert FW short and spon hls changes on prod

...in attempt to resolve non-playing ads issue for all dev build
Set longprofile to c4_ios_test / c4_ios_live...

...as hls ads are not working from FW.
Added longprofile and admanagerlocation properties to freewheel
Merge pull request #8 from belabursan/and775

Added longprofile and admanagerlocation properties to freewheel
fix conflicts