teste commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	parcelApp/src/com/parcelinc/parcelapp/db/DBHelper.java
Merge remote-tracking branch 'origin/master'