Fix javadoc
Fix toString of Ask
Merge branch 'develop'