delete *.pyc
merge dev