possibly fixed versioning
Merge branch 'devel' of github.com:raygenbogen/wiki into devel

Conflicts:
	static/css/bootstrap.css