Merge branch 'devlop' into feature/leo2991
Merge branch 'devlop' into feature/leo2991
Merge branch 'devlop' into feature/leo2991
Merge branch 'devlop' into feature/leo2991
update plist format to ios6
Merge branch 'feature/leo2991' of https://github.com/bird1204/shaCookie into feature/leo2991
working with MFSideView
movestartfinish

movestartfinish
t
Merge branch 'feature/bird1204' into devlop

Conflicts:
	miniGame/AppDelegate.m
	miniGame/en.lproj/ViewController.xib
	miniGame/entryViewController.m
Merge branch 'feature/leo2991' into devlop

Conflicts:
	miniGame/AppDelegate.m
	miniGame/en.lproj/ViewController.xib
	miniGame/entryViewController.m