database clean up method implemented
merge conflict solved
code cleanup
fixed merge conflict, general cleanup
Merge pull request #70 from red-admirals-2014/db_clean

Db clean