javadoc store
Merge branch 'master' of https://github.com/roe/MULE-Team6

# By Alex Roe
# Via Alex Roe
* 'master' of https://github.com/roe/MULE-Team6:
  fix merge conflict