11
Merge branch 'master' of https://github.com/baoyi/SimpleLauncher

Conflicts:
	src/com/inzi123/widget/ScrollLayout.java
	src/com/inzi123/widget/ScrollLayout1.java