Moved /server_information to testing
Merge branch 'master' into website
Some cleanup + minor order bug fixes
Merge branch 'master' into website