pulling thomas' changes
DA-76 merged 2 activities into a single activity
DA-76 merged 2 activities into a single activity