Configuration file loader added.
Merge branch 'web-api' of git@github.com:ucam-cl-dtg/urop-2014-git.git into web-api
Updated ConfigurationLoader.java