Redefined a Mapping module
Merge branch 'az_upstream' of github.com:datahogs/tirexs into az_upstream

Conflicts:
	ebin/tirexs.app