wg
ok

Change-Id: I259a3d8aec2f64c96446c4f4b4307818e086651e
test2
test22
Merge branch 'master' of https://github.com/somoplay/eadating.git

Conflicts:
	somoplay/src/main/java/com/somoplay/somoplay/domain/Test11.java