major changes in grammar contd.
Merge branch 'master' of https://github.com/nileshrege/El

Conflicts:
	el/src/org/regeinc/lang/El.xtext
	el/src/org/regeinc/lang/generator/AssociationJ.xtend
	el/src/org/regeinc/lang/generator/ConditionJ.xtend
	el/src/org/regeinc/lang/generator/ExpressionJ.xtend
	el/src/org/regeinc/lang/generator/LineStatementJ.xtend
	el/src/org/regeinc/lang/generator/MethodJ.xtend
	el/src/org/regeinc/lang/scoping/ElScopeProvider.java
	el/src/org/regeinc/lang/validation/ElJavaValidator.java