Merge branch 'master' into refactor/45-markdown

Conflicts:
	application/ui/components/method.jsx
Merge branch 'master' into refactor/45-markdown
Merge branch 'refactor/45-markdown' of github.com:synapsestudios/lively into refactor/45-markdown
separate styles for md files into own scss file
style markdown
refactor markdown classes