remove marked() from method and resource
start implementing activity section of example github config with markdown synopsis and non-method page example
Merge branch 'master' into refactor/45-markdown

Conflicts:
	application/ui/components/method.jsx
Merge branch 'master' into refactor/45-markdown

Conflicts:
	application/ui/components/method.jsx
Merge branch 'master' into refactor/45-markdown
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
Merge branch 'master' into refactor/45-markdown
Merge branch 'refactor/45-markdown' of github.com:synapsestudios/lively into refactor/45-markdown
Merge remote-tracking branch 'origin' into refactor/45-markdown

Conflicts:
	application/ui/scss/components/panel/_panel.scss
Merge pull request #45 from synapsestudios/refactor/45-markdown

refactor markdown support to enable non-method doc pages
Merge commit '735f14cac2fb7e709a48f955dd6a84fb4012bd3c' into feature/58-add-missing-github-api-endpoints

Conflicts:
	application/config/config.github.js
	application/config/github/activity/events.js
	application/config/github/activity/feeds.js