mini cambios
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	apollomobileProject/Apollo/src/main/java/com/retoric/apollomobile/db/ApolloDatabaseHelper.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
mini cambios