Merge branch 'release' of github.com:systemed/iD into release
Fix Google Analytics include.
Merge branch 'master' into release

Conflicts:
	index.html
Merge branch 'master' into release