Removed main method from Test class.
Added "dev" as possible input parameter for ServerApplication (Server
main class) main method
Merge branch 'master' of https://github.com/birgerpersa/CGLS.git