Merge branch 'master' of https://github.com/Maltretieren/maltretieren.github.com

Conflicts:
	_posts/apidoc/2014-11-03-ApiDoc.md