Adding intro for users & some product link updates
Updating Demo server info
Merge remote-tracking branch 'origin/develop'

Conflicts:
	omero/index.txt
Adding missing word to user/index
Merge pull request #383 from hflynn/fs_users

Updating User index page & demo server for FS