added missed traps macros to 2-3 scenarios
added unusefful android deploy script