12
Merge branch 'master' of https://github.com/forcestone/domplus

Conflicts:
	protected/views/site/my_advers.php
12