Merged Master into Ben

Daniel added database functionality.