Merge branch 'tizen_2.1' into develop

Merge branch 'tizen_2.1' into develop

Conflicts:
	org.tizen.injector.device/src/org/tizen/injector/device/battery/page/BatteryPage.java
	org.tizen.injector.device/src/org/tizen/injector/device/earjack/page/EarjackPage.java
	org.tizen.injector.device/src/org/tizen/injector/device/rssi/page/RssiPage.java
	org.tizen.injector.device/src/org/tizen/injector/device/sdcard/page/SdcardPage.java
	org.tizen.injector.device/src/org/tizen/injector/device/usb/page/UsbPage.java
	org.tizen.injector.location.core/src/org/tizen/injector/location/core/injector/LocationInjector.java
	org.tizen.injector.sensor.light/src/org/tizen/injector/sensor/light/page/LightPage.java
	org.tizen.injector.sensor.motion/src/org/tizen/injector/sensor/motion/page/MotionPage.java
	org.tizen.injector.sensor.proximity/src/org/tizen/injector/sensor/proximity/page/ProximityPage.java
	org.tizen.injector.telephony.call/src/org/tizen/injector/telephony/call/page/MOMTCall.java
	org.tizen.injector/src/org/tizen/injector/view/InjectorView.java
	package/changelog
	package/pkginfo.manifest