Updated mocdule files
Merge branch 'master' of github.com:drrgateway/gateway

Conflicts:
	.gitignore