replaced double underscores with single ones
unified map methods
Merge branch 'feature-improve-events-mapping' into develop

Conflicts:
	base/src/classes/url.coffee
Merge branch 'develop'