Still working on sub menu for shop
Can slide sub menu under shop now, not handle quite correct UI yet
Done sub ribbon
Merge branch 'dev_peace' into dev

Conflicts:
	nbproject/private/private.xml