fake-stash
prep merge
Merge branch 'develop' of https://github.com/alternatex/store into develop

Conflicts:
	src/server/php/Store/Dispatcher.php
continued refactoring to haxe