Increased ActivityMonitor timeout for DEV@cloud
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/instrumentTest/java/com/cloudbees/gasp/activity/ConsoleActivityTest.java
	src/instrumentTest/java/com/cloudbees/gasp/activity/PlacesDetailActivityTest.java
	src/instrumentTest/java/com/cloudbees/gasp/activity/RestaurantListActivityTest.java
	src/instrumentTest/java/com/cloudbees/gasp/activity/ReviewListActivityTest.java
	src/instrumentTest/java/com/cloudbees/gasp/activity/UserListActivityTest.java