Merge branch 'master' into develop
delete unused files
add upload function
add isAuthorized()
fix layouts
fix html escape
add attachment file to WikiPage
delete comments
fix wikiparser's path to images
Merge branch 'develop'