modified:   FlightCheck/CheckActions.js
	modified:   TestCase/TestcaseOptions2.js
	modified:   TestCase/inLand/testcase07.js
	modified:   running7.sh
	modified:   TestCase/TestcaseOptions2.js
	renamed:    TestCase/inLand/testcase05.js -> TestCase/inLand/testcase_out05.js
	renamed:    TestCase/inLand/testcase06.js -> TestCase/inLand/testcase_out06.js
	renamed:    TestCase/inLand/testcase07.js -> TestCase/inLand/testcase_out07.js
	modified:   running7.sh
	modified:   LogIn/Loginin/loginin1.js
	new file:   TestCase/inLand/testcase_in07.js
	modified:   TestCase/inLand/testcase_out07.js
	new file:   running_in7.sh
	renamed:    running7.sh -> running_out7.sh
	modified:   TestCase/temp__.txt
Merge branch 'master' of https://github.com/andypeker/UIAutoNav

Conflicts:
	TestCase/inLand/testcase_out07.js

	modified:   FlightCheck/CheckActions.js
	modified:   LogIn/Loginin/loginin1.js
	modified:   TestCase/TestcaseOptions2.js
	new file:   TestCase/inLand/testcase_in07.js
	renamed:    TestCase/inLand/testcase05.js -> TestCase/inLand/testcase_out05.js
	renamed:    TestCase/inLand/testcase06.js -> TestCase/inLand/testcase_out06.js
	renamed:    TestCase/inLand/testcase07.js -> TestCase/inLand/testcase_out07.js
	modified:   TestCase/temp__.txt
	deleted:    inLand/BillEdit_Login/billElementcheck.js
	new file:   running_in7.sh
	renamed:    running7.sh -> running_out7.sh
	inLand/BillEdit_Login/inbillElementcheck.js