Signed-off-by: Administrator <Administrator@PC-201303102028>

Change-Id: Ib433f61e4442e5756fe98c9df24ccf36f68ce238
Merge remote-tracking branch 'origin/hibernate' into hibernate

Conflicts:
	base/src/main/resources/database/menu.sql