Removed traces of old merges, commented out parse database calls for debug
Merge branch 'master' of https://github.com/pennja01/NorseSquare