logger.js
commiting logger.js
Merge branch 'master' into log
logs
logger.js + simulator last changes
Merge branch 'web' into log

Conflicts:
	js/server/server.js
server.js changes
Merge branch 'master' into web