Added type name and use it as discriminator for operators (+ string, int, double, - int, double).
Merge branch 'master' into regex

Conflicts:
	src/ast_all.hpp
	src/context.cpp