增加注释
Merge branch 'master' of https://github.com/baoyi/Launcher2-Standalone

Conflicts:
	src/com/callmewill/launcher2/widget/CellLayout.java