Change assets download location.
Merge upstream changes.  Working on finding a compromise for the user specifc includes.

Conflicts:
	MCU-EndUser/.classpath