Merge branch 'master' into ui

Conflicts:
	what-is-categorical-imperative/index.html
Merge branch 'master' into post

Conflicts:
	what-is-categorical-imperative/index.html
Merge branch 'development' into ui
Merge branch 'development' into post
Merge pull request #122 from luixxiul/post

Post