Merge from branches corrected, more specifically at
src/br/ikomm/hsm/AgendaActivity.java