21-08
2: 21-08
Merge branch 'master' of https://github.com/baseif/APL

Conflicts:
	protected/modules/user/views/Client/registration.php
	protected/views/Client/_form.php
	protected/views/contact/_form.seif.php
	protected/views/layouts/main.php