bugfix php-mode and refactoring
bugfix and add geben
merge master