Merge branch 'Due'

Conflicts:
	Adafruit_TFTLCD.cpp
	Adafruit_TFTLCD.h
	pin_magic.h
merge follies
Restored

Restored files mistakenly deleted
fix baddie in due merge, compilable

doesn't work on microtouchx though
tested and working with microtouchx