12/7/14 fixed database
12/8/14 dauji's work is here hopefully everything works
Merge branch 'develop' into patrick