commit 2
Merge branch 'master' of https://github.com/tmdevel/DemoApp.git

Conflicts:
	DemoApp/src/com/example/demoapp/MainActivity.java