[FIX] resolved merge conflicts
[FIX] resolved merge conflicts (cont'd)
[FIX] fixed concat iterator for empty stringsets
Merge branch 'master' of github.com:weese/seqan into fix/test_index_stree_iterators
[FIX] reverse-commit peculiar patch
[DOC] Fixing whitespace in signature display of dox.
Merge pull request #211 from holtgrewe/dox_css_signature

[DOC] Fixing whitespace in signature display of dox.
Merge branch 'fix/test_index_stree_iterators'
Merge branch 'fix/test_index_stree_iterators' into develop

Conflicts:
	core/include/seqan/sequence/iter_concat_virtual.h
[FIX] removed duplicate _setPosition()
Merge pull request #213 from weese/develop

[FIX] hotfix for stree iterators on empty string sets (develop branch)
[FIX] disable OpenMP warnings for travis and clang
Merge branch 'hotfix/travis-disable-openmp-warnings' into develop
Merge pull request #215 from weese/develop

Disable OpenMP warnings for travis and clang