Merge
Merge branch 'ws' of https://github.com/thiagofrohlich/android into ws

Conflicts:
	CasaMinha/src/com/ufpr/casaminha/controller/Detalhe.java