Sensors
Merge remote-tracking branch 'origin/Branch_Ranjith' into FirstBranch

Conflicts:
	IViewer/src/com/android/iviewer/ImagesGridActivity.java