frenchie16/wpi-suite-team6 — pull request #1 by frenchie16 (2013-11-10 08:05:14+00:00)
Title: Merge server_database_dev into dev

I have made some progress in server_database_dev and it is ready to merge back into dev.