Fixed th alignment of settings #17
Supported emotion icon of wiki extension plugin #18
Same GitHub fonts #13
Same GitHub pre style #14
Fixed border-radious #16
gray icon
Build r7
Same alignment in wiki as GitHub markdown #19
Updated r7
Same line-height as GitHub markdown
Adjust flash border-radious #16
Updated README for development
Merge remote-tracking branch 'upstream/master'

Conflicts:
	images/logo.png
	stylesheets/application.css
Added owk logo
use owk logo