feature update
Merge branch 'master' of https://github.com/Seabody/MyBB-Wiki

Conflicts:
	Upload/wiki.php

	modified:   Upload/wiki.php