moved src/ios/Airship/UI/Default/Common/Resources contents to src/ios/Airship/UI/Default/Common/Resources/UrbanAirship to avoid conflict with existing resource files upon cordova plugin add
Merge branch 'fix_resource_conflict'