Added some advertisement support. Should consider changing arrayList to perhaps HashMap. If you get exceptions running this remove your old "active" "available" "pending".
Added some advertisement support. Should consider changing arrayList to perhaps HashMap. If you get exceptions running this remove your old "active" "available" "pending".

Resolved conflict.
Conflict
Conflict
Merge origin/master