Beta version

Added Hackathon Edition, made Software Proposal match Annotated version,
cleaned up some annotations