user added
Merge branch 'master' of github.com:ebesser/fuchsia

Conflicts:
	log/development.log
	tmp/cache/assets/CEA/D70/sprockets%2Fd3fb9478a41cbf4898502086e1c267a7
	tmp/cache/assets/CEC/FA0/sprockets%2Fcee8c6b09c33d2b276753e959712724e
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D8C/A10/sprockets%2Ffc7201c6cbef32453aa4175c520c8eae
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/DF3/DA0/sprockets%2F31abb6415b95d9bbcd5fad6d395c10eb
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af