#130 - Fixing server_controller spec and moved server_xml_spec to new rails.
Merge pull request #208 from bsharanya/master

#130 - Fixing server_controller spec and moved server_xml_spec to new rails