Fixed listing slaves
removing scanning from master_server.cpp
Merge /home/littlej/dev/bling
cosmetic changes to show page
todo update