wiki updates
Merge branch 'master' of git@github.com:newicon/Nii.git

Conflicts:
	public/protected/app/modules/nii/widgets/markdown/NMarkdownFormat.php