rest wip
Docs
local fix
Merge branch 'demo' of git://github.com/kvakvs/macaba into demo

Conflicts:
	apps/mcweb/src/mcweb_html_public.erl
Minor edits
Merge branch 'master' into rest

Conflicts:
	apps/mcweb/src/mcweb_app.erl
	apps/mcweb/src/mcweb_rest_thread.erl
Transferring blueprint from apiary.io
Resource for post, preview function
Test fixes
Merge remote-tracking branch 'origin/rest'
Merge branch 'master' into demo

Conflicts:
	apps/mcweb/priv/tpl/post.html
	apps/mcweb/src/mcweb_html_public.erl
Merge branch 'demo' of git://github.com/kvakvs/macaba into demo
User input HTML safe, thumbnail always jpeg
Merge remote-tracking branch 'origin/rest' into demo