wings test
Merge branch 'master' of https://github.com/msgm2013/msgm.git

Conflicts:
	MSGM/src/com/msgm/bean/User.java

Change-Id: If8b9b857b6211128a71bb51198118321961f8a6d
0.0

Change-Id: I03009ec172f9814b811ad123763de5699641e018