feature for 1.1
Finish Release-1.0

Conflicts:
	a.php
Finish Release-1.0