save inlines and so
put mptt html templates in General templates admin
update tables structure of General and Welcome
new sql only forGeneral: Types and Arts
Merge branch 'add_admin_forms' of github.com:CICIC/gestioCI_butterfly_release into add_admin_forms

Conflicts:
	General/models.py
new sql for General and Welcome: Types and Arts
new sql for General and Welcome: Types and Arts
Akin member and new sql for Welcome: Types
Merge branch 'add_admin_forms' of github.com:CICIC/gestioCI_butterfly_release into add_admin_forms
add record_type to human inlines on AccountCes, AccountBank and AccountCrypto
add default record_type to human inlines on AccountCes, AccountBank and AccountCrypto
add default name as __unicode__ for Welcome admin iC_Records, also add filter to mptt dropdown in iC_Membership admin
Merge branch 'add_admin_forms' of github.com:CICIC/gestioCI_butterfly_release into add_admin_forms
update to admin Welcome Akin Membership, also a try on django-mptt-admin in General.Relation...
update to admin Welcome Akin Membership, also a try on django-mptt-admin in General.Relation...
update to admin Welcome Akin Membership, new sql for General and Welcome (types and few records)
add mixin AutoName to General.admin
https://wiki.enredaos.net/index.php?title=CICICdev/august#Formulari_d.27alta
Merge branch 'add_admin_forms' of github.com:CICIC/gestioCI_butterfly_release into add_admin_forms
Delete settings.py