test A
Merge remote-tracking branch 'origin/master'

Conflicts:
	OrderAtSamos/bin/classes/com/tardis/ordersamos/BanList.class