Add attributes to location and broadcast
Merge branch 'broadcast-location-attributes' into stage

Conflicts:
	src/main/java/org/atlasapi/persistence/MongoContentPersistenceModule.java