q pasa
qMerge branch 'master' of https://github.com/dmelian/imywa

Conflicts:
	source/bas/frmx/cardlistframe.php
	source/bas/html/listframe.php
Merge branch 'master' of https://github.com/dmelian/imywa
textarea