Add type to search

Still fail
Merge remote-tracking branch 'origin/master' into TextPro

Conflicts:
	TextPro/src/main/java/cz/cuni/mff/ufal/textan/textpro/TextPro.java
Fixed #75 wrong property name in HQL query
testing git on android
Merge branch 'master' of https://github.com/PreXident/TextAn.git
Test diversity of types, aliases
Renamed TextPro subproject to ObjectAssigner
Renamed package *.texpro to *.assigner
Merge branch 'master' of https://github.com/PreXident/TextAn.git
Renamed classes with TextPro in name
Architecture: Features added
DOC DB DAO
added comment about db drivers for @gbread
DOC DB Added dao and persistent layer pictures

todo: describe them
Merge remote-tracking branch 'origin/server-impl'
DOC DB persistent layer
Merge remote-tracking branch 'origin/TextPro'

Conflicts:
	Server/build.gradle
	Server/settings.gradle
	settings.gradle
Merge branch 'master' of https://github.com/PreXident/TextAn
Document Proofing: Architecture:Database

Need to be read again
Merge branch 'master' of https://github.com/PreXident/TextAn.git