Merge branch 'gh-pages' of https://github.com/intey/asdklei into gh-pages

Conflicts:
	stylesheets/stylesheet.css
Merge branch 'gh-pages' of https://github.com/intey/asdklei into gh-pages

Conflicts:
	stylesheets/stylesheet.css