Merge branch 'master' into beta
Merge branch 'develop' into beta
BOOH - 138 , 136 : Push from Alpha to Beta
BOOH - 139 : Push from Alpha to Beta : Map Labels are not displaying in PPT under market overview slide
BOOH - 133 : Push from Alpha to Beta :Units are not rejecting when uploading a grid with Null in Vendor
BOOH - 133 : Push from Alpha to Beta : Extend Planning Grid and Maps to handle same Lat/Long for more than 2 facings, different Media types and Vendors. Partial push
BOOH - 95 : Push from Alpha to Beta : Extend Planning Grid and Maps to handle same Lat/Long for more than 2 facings, different Media types and Vendors. Partial push
Merge branch 'master' of alpha.boohma.com:beta into beta

Conflicts:
	content/_js/inc/grids-item.js
	content/_processes/ppt-export.php
Billing: Invoice History API Auto-Loop Script Update.
Merge branch 'master' of boohma.com:production
Merge branch 'feature-photosheets' into beta
BOOH 164: Handled no facings for same location icons
BOOH 164: Handled no facings for same location icons
Ticket 1812: Testing for attachement
Boohma:148
Ticket 1812: reverted the email address
Merge branch 'master' of boohma.com:production
BOOH 164: Handled no facings for same location icons fix 1
Merge branch 'develop' of alpha.boohma.com:alpha into develop
BOOH 165: no facings for nofacing icons