add ILI9341 support - shield is no longer default (new shield has new library)
Merge branch 'master' of github.com:adafruit/TFTLCD-Library

Conflicts:
	Adafruit_TFTLCD.cpp
	Adafruit_TFTLCD.h