more work on modules
Merge branch 'master' of https://github.com/tenebroso/telegram-server

Conflicts:
	server.js