Merge branch 'master' of https://gitbucket.astraeus.nl/git/rnentjes/simple-database-kotlin
...
# Conflicts:
# .idea/modules/simple-database-kotlin_main.iml
# .idea/modules/simple-database-kotlin_test.iml
# build.gradle
# src/nl/astraeus/database/Queries.kt
# test/nl/astraeus/database/TestQueries.kt