oisaoisoai
Merge remote-tracking branch 'origin/master'

Conflicts:
	SAP/src/main/java/br/al/sap/MainActivity.java
oisaoisoai