disable maxima if not exsits
Merge remote-tracking branch 'origin/master'

Conflicts:
	init-main.el
remove shader to sl