Updated license and added conventions.tex
merged devel