change

change
fixed bug

fixed bug
Merge branch 'master' of https://github.com/sunalwaysrise/cp2y

Conflicts:
	res/js/base.min.js