changed README.md
changed LICENSE
Merge branch 'hotfix/20141108'