Added beacon model
Backend work
Merge remote-tracking branch 'origin/master'