WiFi Shield examples: added the firmware version check
If 2 libs have same .h file, use the lib with same dir name
Merge pull request #1853 from PaulStoffregen/master

If 2 libs have same .h file, use the lib with same dir name
Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java