Work continued.
Merge remote-tracking branch 'origin/manfred' into roland
- fixed compile errors
Conflicts:
	org.openntf.domino/src/org/openntf/domino/formula/AtFormulaParserImplTokenManager.java
	org.openntf.domino/src/org/openntf/domino/formula/DominoFormatter.java
	org.openntf.domino/src/org/openntf/domino/formula/ast/AtFormulaParserImplTreeConstants.java
	org.openntf.domino/src/org/openntf/domino/formula/ast/atFormula.jj
	org.openntf.domino/src/org/openntf/domino/formula/atFormula.jjt
	org.openntf.domino/src/org/openntf/domino/formula/parse/AtFormulaParserImpl.java
	org.openntf.domino/src/org/openntf/domino/formula/parse/AtFormulaParserImplConstants.java