quick check in
Merge branch 'MayRelease' of https://github.com/RareCrowds/OpenAdStack into MayRelease

Conflicts:
	WebLayer/WebLayer/Campaign/DynamicAllocationCampaign/Campaign.html