quickpush
Merge branch 'master' of https://github.com/fh-koeln/wba1-2013-open-data-projekt

Conflicts:
	cakephp/app/tmp/cache/persistent/myapp_cake_core_file_map