Merge branch 'develop'

Conflicts:
	Node/fumi-server/README
Merge branch 'master' of github.com:anonaka/Fumi

Conflicts:
	Node/fumi-server/README
added pill