added database layer. check jdbc.properties file for database settings
fixed conflicts
Merge branch 'master' of https://github.com/nieuwtje/buyabike