Enabled javadoc task
Merge branch 'dev'
Updated to create jar directory on compile
Resolved merge conflict
Merge from dev
Merge branch 'dev'

Conflicts:
	build.xml
Merge branch 'master' of https://github.com/thecyberwraith/akeldama-java into dev
Started platform collisions