working on synchronisation
Merge branch 'master' into ServletConnection

Conflicts:
	android WS/BeeHappy/src/com/example/beeproject/global/classes/BeeObjectClasses.java
	android WS/BeeHappy/src/com/example/beeproject/syncing/SyncHelper.java
Fixed bug with foreign objects.
TODO: implement syncronisation for diseases
added outbreak and diseasenotes tables
Database creates automatically + diseases table fills if empty
Synchronisation ready
Merge pull request #10 from vankatwijk/ServletConnection

Servlet connection