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