Switched off debug messages
Fixing all references to GIT repo from DOKU_INC to savedir
Fixing misc issues
execute pull instead of merge
Fixing php5.4 errors