5.27

1.添加了一些注释
2. UI的一些小修改
testing some differences
testing2
1. some comments
5.27
1. last commit
fix for merge
Merge branch 'dev-1'

Conflicts:
	Metic.xcodeproj/project.xcworkspace/xcuserdata/ligang5.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'dev-2' of https://github.com/wjling/Metic

Conflicts:
	Metic/Base.lproj/Main_iPhone.storyboard
sss