commit for update
Merge branch 'master' of
https://github.com/gtforge/mobile-automation.git

Conflicts:
	robotium-client/src/main/java/org/jsystemtest/mobile/robotium_client/impl/RobotiumClientImpl.java