//Javadoc changes
Merge branch 'master' of github.com:TothVendel/MICSCRSoftDevel