Merge branch 'master' of https://github.com/reactnativecomponent/react-native-local-image

# Conflicts:
#	ios/RNLocalImage/RNLocalImage/RNOrgImageView.m

Author: guangyao

README.md

@@ -15,15 +15,15 @@
 #### iOS
 
 1. In XCode, in the project navigator, right click `Libraries` ➜ `Add Files to [your project's name]`
-2. Go to `node_modules` ➜ `react-native-local-image` and add `RNInputRecord.xcodeproj`
-3. In XCode, in the project navigator, select your project. Add `libRNInputRecord.a` to your project's `Build Phases` ➜ `Link Binary With Libraries`
+2. Go to `node_modules` ➜ `react-native-local-image` and add `RNLocalImage.xcodeproj`
+3. In XCode, in the project navigator, select your project. Add `libRNLocalImage.a` to your project's `Build Phases` ➜ `Link Binary With Libraries`
 4. Run your project (`Cmd+R`)<
 
 #### Android
 
 1. Open up `android/app/src/main/java/[...]/MainActivity.java`
-  - Add `import com.reactlibrary.RNInputRecordPackage;` to the imports at the top of the file
-  - Add `new RNInputRecordPackage()` to the list returned by the `getPackages()` method
+  - Add `import com.local.image.RCTLocalPackage;` to the imports at the top of the file
+  - Add `new RCTLocalPackage()` to the list returned by the `getPackages()` method
 2. Append the following lines to `android/settings.gradle`:
   	```
   	include ':react-native-local-image'
@@ -34,20 +34,12 @@
       compile project(':react-native-local-image')
   	```
 
-#### Windows
-[Read it! :D](https://github.com/ReactWindows/react-native)
-
-1. In Visual Studio add the `RNInputRecord.sln` in `node_modules/react-native-local-image/windows/RNInputRecord.sln` folder to their solution, reference from their app.
-2. Open up your `MainPage.cs` app
-  - Add `using Com.Reactlibrary.RNInputRecord;` to the usings at the top of the file
-  - Add `new RNInputRecordPackage()` to the `List<IReactPackage>` returned by the `Packages` method
-
 
 ## Usage
 ```javascript
-import RNInputRecord from 'react-native-local-image';
+import RNLocalImage from 'react-native-local-image';
 
-// TODO: What to do with the module?
-RNInputRecord;
+// TODO: What to do with the view?
+RNLocalImage;
 ```
-  
+  

ios/RNLocalImage/RNLocalImage/RNOrgImageView.m

@@ -29,7 +29,6 @@ - (void)layoutSubviews{
     if ([_path length]) {
         UIImage *img = [[UIImage alloc]initWithContentsOfFile:_path];
         self.image = img;
-        
     }
 }