add license
modify license
Merge branch 'dev'

Conflicts:
	license