structure is ready.
Merge remote-tracking branch 'origin/master'

Conflicts:
	default.php
remove and popup ready.