voltando
vota
Merge branch '0.6' of https://github.com/RoniSouza/MaisSaudeApp into 0.6

Conflicts:
	gen/br/com/maissaudeapp/R.java
	res/layout/main.xml
	res/values/strings.xml
	src/br/com/maissaudeapp/PacienteScanActivity.java