Added javadocs and moved some constants to the constants class
Merge remote-tracking branch 'ervo-repo/master'