Merge branch 'public/combinat/14770/asmtrans' into findstat/master

Conflicts:
	src/sage/combinat/alternating_sign_matrix.py
Merge branch 'master' of http://github.com/Findstat/sage into findstat/master