second commit
Merge branch 'master' of github.com:zondaOf2012/AndroidPro4MySlideAppTemplate

Conflicts:
	src/com/zonda/template/MainActivity.java