task_activity

new functions implemented
Merge branch 'master' of https://github.com/isld/databees-mobile

Conflicts:
	Databees/bin/Databees.apk
	Databees/bin/R.txt
	Databees/bin/classes.dex
	Databees/bin/classes/nl/isld/databees/ApiaryInfoFragment.class
	Databees/bin/classes/nl/isld/databees/MainActivity.class
	Databees/bin/classes/nl/isld/databees/R$attr.class
	Databees/bin/classes/nl/isld/databees/R$color.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$integer.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/TaskAdapter.class
	Databees/bin/classes/nl/isld/databees/rss/RSSFeed.class

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

Databees/bin/dexedLibs/google-play-services-9f3b18ecff267596a9760f2b59ba
aec8.jar

Databees/bin/dexedLibs/google-play-services_lib-b135aa7cb43e431dbe885be3
f7cb87ac.jar

Databees/bin/dexedLibs/htmlcleaner-2.6.1-79d6e19a33b02951870ed826c752cc6
4.jar
	Databees/bin/dexedLibs/library-31fb4c6e906f9c918617e94f1c322586.jar
	Databees/bin/resources.ap_