First Commit. Things that are ready:
- Add and Delete apiaries
- Geolocation for apiaries is working

Currently working on:
- Add and Delete hives
- Apiary details screen with hive list
Code and style fixes
Implemented basic weather functions.
State before improving the map functionality
Somewhere between the mess and a somehow working alpha product
Implemented most of the basic functionality:
- Add and manage apiaries
- Add and manage hives
- Add and manage inspections
The code is messy and is still not communicating with the server.
Off to the testers.
project_merge

Projects from Suraj and John merged to one
Merge branch 'ioannes'

Conflicts:
	Databees/.classpath
	Databees/.project
	Databees/AndroidManifest.xml
	Databees/bin/AndroidManifest.xml
	Databees/bin/Databees.apk
	Databees/bin/classes.dex
	Databees/bin/classes/nl/isld/databees/MainActivity.class
	Databees/bin/classes/nl/isld/databees/R$attr.class
	Databees/bin/classes/nl/isld/databees/R$dimen.class
	Databees/bin/classes/nl/isld/databees/R$drawable.class
	Databees/bin/classes/nl/isld/databees/R$id.class
	Databees/bin/classes/nl/isld/databees/R$layout.class
	Databees/bin/classes/nl/isld/databees/R$menu.class
	Databees/bin/classes/nl/isld/databees/R$string.class
	Databees/bin/classes/nl/isld/databees/R$style.class
	Databees/bin/classes/nl/isld/databees/R$styleable.class
	Databees/bin/classes/nl/isld/databees/R.class
	Databees/bin/classes/nl/isld/databees/SplashScreen.class

Databees/bin/dexedLibs/android-support-v4-378302c450ad16450da8881b8622b5
93.jar

Databees/bin/dexedLibs/htmlcleaner-2.6.1-79d6e19a33b02951870ed826c752cc6
4.jar
	Databees/bin/jarlist.cache
	Databees/bin/resources.ap_
	Databees/gen/nl/isld/databees/R.java
	Databees/proguard-project.txt
	Databees/project.properties
	Databees/res/anim/fade_in.xml
	Databees/res/anim/fade_out.xml
	Databees/res/layout/activity_main.xml
	Databees/res/menu/actvity_main.xml
	Databees/res/values-sw720dp-land/dimens.xml
	Databees/res/values/dimens.xml
	Databees/res/values/strings.xml
	Databees/res/values/styles.xml
	Databees/src/nl/isld/databees/MainActivity.java