Merge branch 'master' of https://github.com/AIcarus/AIcarus.github.io

Conflicts:
	_posts/2014-04-1-Devstack-Havana-And-Pitfalls
Merge branch 'master' of https://github.com/AIcarus/AIcarus.github.io