update
Merge branch 'master' of github.com:momoplan/petandroid1

Conflicts:
	res/drawable-hdpi/Thumbs.db
Merge branch 'master' of github.com:momoplan/petandroid1
Merge branch 'master' of github.com:momoplan/petandroid1
Merge branch 'master' of github.com:momoplan/petandroid1
Merge branch 'master' of github.com:momoplan/petandroid1
update
Merge branch 'master' of github.com:momoplan/petandroid1