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

Conflicts:
	app/Model/Resolution.php