updated tables in friends views
Merge branch 'debug' into dev
Merge branch 'dev' of github.com:crwilliams87/WiFiNDR-v2 into dev