Fix
Fix
Merge branch 'master' of github.com:aherranz/jsongen

Conflicts:
	src/js_links_machine.erl