Finish 1.1 - Lan 2
update develop
update release1.2
update release 1.2
Finish 1.2

Conflicts:
	New folder/link.txt