more progress on server
meging

Merge branch 'installed' of github.com:sociam/indx into installed