Merge branch 'resourcepriorities' into picturefull

Conflicts:
	picturefill.js