Перевел калькуляторы на выбор бинов через @Qualifier-ы
	new file:   EJB-Default/src/main/java/my/home/jee2/calc/CalcBean.java
	renamed:    EJB-Default/src/main/java/my/home/jee2/ELCalc/CalculatorBeanEL.java -> EJB-Default/src/main/java/my/home/jee2/calc/el/CalculatorBeanEL.java
	new file:   EJB-Default/src/main/java/my/home/jee2/calc/el/EL.java
	renamed:    EJB-Default/src/main/java/my/home/jee2/SimpleCalc/CalcState.java -> EJB-Default/src/main/java/my/home/jee2/calc/sy/CalcState.java
	renamed:    EJB-Default/src/main/java/my/home/jee2/SimpleCalc/CalculatorBeanSY.java -> EJB-Default/src/main/java/my/home/jee2/calc/sy/CalculatorBeanSY.java
	renamed:    EJB-Default/src/main/java/my/home/jee2/SimpleCalc/Lexer.java -> EJB-Default/src/main/java/my/home/jee2/calc/sy/Lexer.java
	renamed:    EJB-Default/src/main/java/my/home/jee2/SimpleCalc/NumericValueType.java -> EJB-Default/src/main/java/my/home/jee2/calc/sy/NumericValueType.java
	renamed:    EJB-Default/src/main/java/my/home/jee2/SimpleCalc/Operation.java -> EJB-Default/src/main/java/my/home/jee2/calc/sy/Operation.java
	new file:   EJB-Default/src/main/java/my/home/jee2/calc/sy/SY.java
	renamed:    EJB-Default/src/main/java/my/home/jee2/SimpleCalc/Token.java -> EJB-Default/src/main/java/my/home/jee2/calc/sy/Token.java
	renamed:    EJB-Default/src/main/java/my/home/jee2/SimpleCalc/TokenType.java -> EJB-Default/src/main/java/my/home/jee2/calc/sy/TokenType.java
	renamed:    EJB-Default/src/test/java/my/home/jee2/SimpleCalc/CalculatorBeanTest.java -> EJB-Default/src/test/java/my/home/jee2/calc/sy/CalculatorBeanTest.java
	renamed:    EJB-Default/src/test/java/my/home/jee2/SimpleCalc/TokenTest.java -> EJB-Default/src/test/java/my/home/jee2/calc/sy/TokenTest.java
	renamed:    WebDefault/src/main/java/my/home/jee2/ELCalc/CalcJSFBeanEL.java -> WebDefault/src/main/java/my/home/jee2/calc/el/CalcJSFBeanEL.java
	renamed:    WebDefault/src/main/java/my/home/jee2/ELCalc/CalculatorServletEL.java -> WebDefault/src/main/java/my/home/jee2/calc/el/CalculatorServletEL.java
	renamed:    WebDefault/src/main/java/my/home/jee2/SimpleCalc/CalcJSFBeanSY.java -> WebDefault/src/main/java/my/home/jee2/calc/sy/CalcJSFBeanSY.java
	renamed:    WebDefault/src/main/java/my/home/jee2/SimpleCalc/CalculatorServletSY.java -> WebDefault/src/main/java/my/home/jee2/calc/sy/CalculatorServletSY.java
Merge branch 'devel' of github.com:ivan-filonov/myJEESite2 into devel

Conflicts:
	EJB-Default/src/main/java/my/home/jee2/calc/CalcBean.java
Merge branch 'devel'