update models spec
update routing spec
update beacon_holder views
udpate station views
Merge branch 'master' into production