fix 1 bug
Add work1Activity
fix MainActivity
Merge branch 'bug1' into dev
Merge branch 'work1' into dev

Conflicts:
	src/com/example/gitexample/MainActivity.java
finish
Merge branch 'dev'