Conflicts:
	alib/src/regexp/Alternation.cpp
	alib/src/regexp/Alternation.h
	alib/src/regexp/Concatenation.cpp
	alib/src/regexp/Concatenation.h
	alib/src/regexp/Iteration.cpp
	alib/src/regexp/Iteration.h
	alib/src/regexp/RegExpElement.cpp
	alib/src/regexp/RegExpElement.h
	alib/src/regexp/RegExpEmpty.cpp
	alib/src/regexp/RegExpEmpty.h
	alib/src/regexp/RegExpEpsilon.cpp
	alib/src/regexp/RegExpEpsilon.h
	alib/src/regexp/RegExpSymbol.cpp
	alib/src/regexp/RegExpSymbol.h
	makefile

Conflicts:
	alib/src/regexp/Alternation.cpp
	alib/src/regexp/Alternation.h
	alib/src/regexp/Concatenation.cpp
	alib/src/regexp/Concatenation.h
	alib/src/regexp/Iteration.cpp
	alib/src/regexp/Iteration.h
	alib/src/regexp/RegExpElement.h
	alib/src/regexp/RegExpEmpty.cpp
	alib/src/regexp/RegExpEmpty.h
	alib/src/regexp/RegExpEpsilon.cpp
	alib/src/regexp/RegExpEpsilon.h
	alib/src/regexp/RegExpSymbol.cpp
	alib/src/regexp/RegExpSymbol.h

Conflicts:
	makefile

 - new dlls:
  - libaderivation - derivations of RE (+ integrals soon(c) )
  - libaregexptree - algorithms on regexp tree (optimizations, special traversal)
 - aderivation library moved outside conversion directory
 - Deleted regexputils. Methods moved directly into alib or libaregexptree
 - Reflect mentioned changes in conversion algorithms
 - Change to makefile (compile alib first, then libs, then binaries)

Remove GrammarUtils::isEpsilonRule (replaced by alib method). Implementation of C++11 for range in RG to FA conversions.