polishing
Merge branch 'master' of https://github.com/Alonai/TralalaServer

Conflicts:
	src/data/Member.java