Wait for activity takes an array

Fix #691
Use the same error message on iOS and Android

Fixes #689
Merge pull request #714 from bootstraponline/array_wait

Wait for activity takes an array
reconfigure alerts code so it starts after appium itself launches
remove extra done() from this test
make sure grunt projects respect new exit code cb framework (fix #713)
remove deprecated flags that default to true
update args for test server (fix #715)
Merge pull request #716 from jlipps/master

misc fixes (including #715, #713)
fix mobile: reset for ios
changelog and bump for npm publish 0.7.0
Changes required to run multiple instances of appium with selendroid on one MAC/PC
replaced '"adb -s + this.curDeviceId" with "this.adbCmd"
fixed spacing
replaced if-else block with ternary operator
Merge branch 'master' of https://github.com/swapna-chennadi/appium

Conflicts:
	app/appium.js