Changed files to work on the server
Merge branch 'development'

Merging the development branch into master.