modification collision
l
Merge branch 'master' of https://github.com/mathieubrochard/mustache.git

Conflicts:
	mustache/src/mustache/Mustache.java