rearranged for dependencies
Merge branch 'master' of https://github.com/asterixom/CookieApp.git

Conflicts:
	working-directory/de.cookieapp.control/.classpath
	working-directory/de.cookieapp.control/.gitignore
	working-directory/de.cookieapp.control/.project
	working-directory/de.cookieapp.data/.classpath
	working-directory/de.cookieapp.data/.gitignore
	working-directory/de.cookieapp.data/.project