Don't add a trailing slash to a module if it already contains one
Merge branch 'master' into no-extra-trailing-slash

Conflicts:
	app/core/utils/modules.js
Merge pull request #15 from sebn/no-extra-trailing-slash

Don't add a trailing slash to a module if it already contains one