license
site + refactoring
bugfixes
Merge commit 'a8c15b4a32c4b7089e8e5c17a50882309a553209'