fix merge command
Merge branch 'master' of github.com:sitronproject/sitron-client
add license