Merge branch 'master' of https://github.com/InternetFarmer/DatabaseProject

Conflicts:
nbproject/private/private.xml