Merges changes made in gh-pages
Merge branch 'develop' of github.com:sapo/Ink into develop