fixed description and server variables for Aalto
Merge branch 'master' into development

Conflicts:
	README.md
ignore hidden files, add fswatch path variable
Added latency of 3sec for syncing
corrected details in readme
Merge branch 'development'