fix
fix
Merge branch 'master' of github.com:foru17/webot-example

Conflicts:
	rules.js
normal
Merge branch 'master' of github.com:foru17/webot-example
Merge branch 'master' of github.com:foru17/webot-example
Merge branch 'master' of github.com:foru17/webot-example
Merge branch 'master' of github.com:foru17/webot-example
Merge branch 'master' of github.com:foru17/webot-example
Merge branch 'master' of github.com:foru17/webot-example
Merge branch 'master' of github.com:foru17/webot-example
Merge branch 'master' of github.com:foru17/webot-example
siva