update license to ASL 2.0
remove no longer needed file
update license to ASL 2.0
Merge branch 'v7-stable' into v8-stable

Conflicts:
	grammar/grammar.y