Merging in Kylie changes
Initial checkin of Kylie changes
Fixed copyright
changed the beacon URL