Javadoc update
Merge origin/develop into develop
Implementing Duel mechanism