added getResource
added events array
javadoced calculatePrice
javadoced calculatePrice
Merge origin/master