form fields for vtfx input
Merge branch 'vtfx' of github.com:mapbox/mapbox-studio into vtfx

Conflicts:
	lib/server.js