refactoring
Merge branch 'master' of https://github.com/egoblock/dm

Conflicts:
	www/common.js