check in the timeout stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	PlanIt/src/main/java/com/planit/utils/WebClient.java