Merge branch 'origin/his/solv'

Conflicts:
	core/modelcheckers/probsolver/src/main/java/org/overture/modelcheckers/probsolver/visitors/VdmToBConverter.java
cleanup
fixed missing update of the interface for the solver
cleanup
added initial support for tokens in the in the solver. A token is either left un constrained or a x:token type is constructed by scanning the specification for mk_token(k) and then combining the types of all arguments of mk_token e.g. typeof(k).

The solver implementation in Java has a problem with tokens as strings. However the cli is ok with it and solves it. see Airport.vdmsl givepermissions
Merge branch 'origin/his/solv'

Conflicts:
	core/modelcheckers/probsolver/src/main/java/org/overture/modelcheckers/probsolver/visitors/BToVdmConverter.java
	core/modelcheckers/probsolver/src/main/java/org/overture/modelcheckers/probsolver/visitors/VdmToBConverter.java