Merge pull request #375 from rzanoli/master

prepare for next development iteration
Merge branch 'master' of https://github.com/hltfbk/Excitement-Open-Platform.git
Merge branch 'master' of https://github.com/oferbr/Excitement-Open-Platform
- added the two types for alignment: alignment.Target and alignment.Link types.
- added "deprecated" text to old alignment (text alignment) type.
- added alignment component and annotator component interfaces to common
- added alignment types to EOP type listing
- small test class
Merge pull request #391 from gilnoh/master

Build all okay without issues --- Adding of types for Alignments.
Merge branch 'master' of https://github.com/hltfbk/Excitement-Open-Platform
Redis-based support version for all SQL-based resources
Merge branch 'master' of
https://github.com/hltfbk/Excitement-Open-Platform

Conflicts:
	core/src/main/resources/configuration-file/biutee.xml
test
add new redis-based resdources configuration to biutee.xml
updated alignment.Link types, according to v3 proposal
Merge pull request #392 from gilnoh/master

updated alignment.Link types, according to v3 proposal. 

Local change for the type system, and builds were all okay.
Redis project was added to the eop.xml. Some distsim conf modifications.
Prev feature storage option was modified
minor change (port number of one redis resource) in biutee.xml conf
Minor change in wiki config
Merge branch 'master' of https://github.com/hltfbk/Excitement-Open-Platform
Simple dirt test class
minor name updates on Link type