change server
Tweaks for compiling on isengard
Merge branch 'development'