switched to AGPL
Merge branch 'dev'