Tokenizer types fixes
Moved old tokenizer types to segmenataion namespace
Commented out descriptor generators
Merge branch 'sidikov' into morph_new

Conflicts:
	UIMA.Ext.Tokenizer/src/main/resources/ru/kfu/cll/uima/tokenizer/tokenizer-TypeSystem.xml
	UIMA.Ext.Tokenizer/src/test/java/ru/kfu/cll/uima/GenerateBasicAggregateDescriptor.java
	UIMA.Ext.Tokenizer/src/test/java/ru/kfu/cll/uima/tokenizer/GenerateJFlexTokenizerDescriptor.java
Morph aggregate ae now uses jflex tokenizer