Vistar API
Merge branch 'master' of git://github.com/mstaneluis/cms
Vistar API Refinement

request add with device id, receive ad, save to database
Vistar - Proof of Play
Uncommitted MISC Files

Target-eclipse files
Merge branch 'master' of https://github.com/mstaneluis/CMS

Conflicts:
	target-eclipse/classes/JQueryResourceTagLib.class
	target-eclipse/classes/JQueryTagLib.class
	target-eclipse/classes/cms/Communications.class
	target-eclipse/classes/cms/CommunicationsController.class
	target-eclipse/classes/cms/CommunicationsControllerSpec.class
	target-eclipse/classes/cms/CommunicationsSpec.class
	target-eclipse/classes/cms/CreativeSpec.class
	target-eclipse/classes/cms/Creatives.class
	target-eclipse/classes/cms/CreativesController.class
	target-eclipse/classes/cms/CreativesControllerSpec.class
	target-eclipse/classes/cms/Devices.class
	target-eclipse/classes/cms/DevicesController.class
	target-eclipse/classes/cms/DevicesControllerSpec.class
	target-eclipse/classes/cms/DevicesSpec.class
	target-eclipse/classes/cms/Hours.class
	target-eclipse/classes/cms/HoursController.class
	target-eclipse/classes/cms/HoursControllerSpec.class
	target-eclipse/classes/cms/HoursSpec.class
	target-eclipse/classes/cms/Insertion_OrdersSpec.class
	target-eclipse/classes/cms/Insertion_orders.class
	target-eclipse/classes/cms/Insertion_ordersController.class
	target-eclipse/classes/cms/Insertion_ordersControllerSpec.class
	target-eclipse/classes/cms/Insertion_orders_organizations.class
	target-eclipse/classes/cms/Insertion_orders_organizationsSpec.class

	target-eclipse/classes/cms/Insertion_orders_organizations_advertisers.class

	target-eclipse/classes/cms/Insertion_orders_organizations_advertisersController.class

	target-eclipse/classes/cms/Insertion_orders_organizations_agencies.class

	target-eclipse/classes/cms/Insertion_orders_organizations_agenciesController.class
	target-eclipse/classes/cms/Insertion_orders_persons.class
	target-eclipse/classes/cms/Insertion_orders_personsSpec.class
	target-eclipse/classes/cms/Insertion_orders_persons_advertisers.class

	target-eclipse/classes/cms/Insertion_orders_persons_advertisersController.class

	target-eclipse/classes/cms/Insertion_orders_persons_advertizersSpec.class
	target-eclipse/classes/cms/Insertion_orders_persons_agencies.class

	target-eclipse/classes/cms/Insertion_orders_persons_agenciesController.class
	target-eclipse/classes/cms/Insertion_orders_persons_agenciesSpec.class
	target-eclipse/classes/cms/Insertion_orders_persons_salespersons.class

	target-eclipse/classes/cms/Insertion_orders_persons_salespersonsController.class
	target-eclipse/classes/cms/Insertion_orders_persons_traffickers.class

	target-eclipse/classes/cms/Insertion_orders_persons_traffickersController.class

	target-eclipse/classes/cms/Insertion_orders_salespersonsControllerSpec.class
	target-eclipse/classes/cms/Insertion_orders_salespersonsSpec.class

	target-eclipse/classes/cms/Insertion_orders_traffickersControllerSpec.class
	target-eclipse/classes/cms/Insertion_orders_traffickersSpec.class
	target-eclipse/classes/cms/Line_items.class
	target-eclipse/classes/cms/Line_itemsController.class
	target-eclipse/classes/cms/Line_itemsControllerSpec.class
	target-eclipse/classes/cms/Line_itemsSpec.class
	target-eclipse/classes/cms/Line_items_creatives.class
	target-eclipse/classes/cms/Line_items_creativesController.class
	target-eclipse/classes/cms/Line_items_creativesControllerSpec.class
	target-eclipse/classes/cms/Line_items_creativesSpec.class
	target-eclipse/classes/cms/List_Times.class
	target-eclipse/classes/cms/List_Venues_Types.class
	target-eclipse/classes/cms/List_Weekdays.class
	target-eclipse/classes/cms/List_location_typesSpec.class
	target-eclipse/classes/cms/List_locations_types.class
	target-eclipse/classes/cms/List_neighborhoods.class
	target-eclipse/classes/cms/List_neighborhoodsSpec.class
	target-eclipse/classes/cms/Locations.class
	target-eclipse/classes/cms/LocationsController.class
	target-eclipse/classes/cms/LocationsControllerSpec.class
	target-eclipse/classes/cms/LocationsSpec.class
	target-eclipse/classes/cms/Locations_neighborhoods.class
	target-eclipse/classes/cms/Locations_neighborhoodsController.class
	target-eclipse/classes/cms/Locations_neighborhoodsSpec.class
	target-eclipse/classes/cms/Organizations.class
	target-eclipse/classes/cms/OrganizationsController.class
	target-eclipse/classes/cms/OrganizationsControllerSpec.class
	target-eclipse/classes/cms/OrganizationsSpec.class
	target-eclipse/classes/cms/Organizations_locations.class
	target-eclipse/classes/cms/Organizations_locationsController.class
	target-eclipse/classes/cms/Organizations_locationsControllerSpec.class
	target-eclipse/classes/cms/Organizations_locationsSpec.class
	target-eclipse/classes/cms/PasswordSpec.class
	target-eclipse/classes/cms/Passwords.class
	target-eclipse/classes/cms/PasswordsController.class
	target-eclipse/classes/cms/PasswordsControllerSpec.class
	target-eclipse/classes/cms/PersonSpec.class
	target-eclipse/classes/cms/Persons.class
	target-eclipse/classes/cms/PersonsController.class
	target-eclipse/classes/cms/PersonsControllerSpec.class
	target-eclipse/classes/cms/Schedules.class
	target-eclipse/classes/cms/SchedulesController.class
	target-eclipse/classes/cms/SchedulesControllerSpec.class
	target-eclipse/classes/cms/SchedulesSpec.class
	target-eclipse/classes/cms/States.class
	target-eclipse/classes/cms/StatesController.class
	target-eclipse/classes/cms/StatesControllerSpec.class
	target-eclipse/classes/cms/StatesSpec.class
	target-eclipse/classes/cms/TargeteerController.class
	target-eclipse/classes/cms/TargeteerControllerSpec.class
	target-eclipse/classes/cms/TimesSpec.class
	target-eclipse/classes/cms/TypesLocationsSpec.class
	target-eclipse/classes/cms/UserControllerSpec.class
	target-eclipse/classes/cms/UsersController.class
	target-eclipse/classes/cms/Venues_statistics.class
	target-eclipse/classes/cms/Venues_statisticsController.class
	target-eclipse/classes/cms/Venues_statisticsControllerSpec.class
	target-eclipse/classes/cms/Venues_statisticsSpec.class
	target-eclipse/classes/cms/WeekdaysSpec.class
	target-eclipse/classes/grails/plugin/cache/CacheTagLib.class

	target-eclipse/classes/grails/plugin/databasemigration/DbdocController.class
	target-eclipse/classes/org/grails/plugin/resource/ResourceTagLib.class