Prepended 'get' and 'on' to methods and events respectively when there's a conflict with a newly generated property.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
Merge pull request #280 from ddobrev/master

Prepended 'get' and 'on' to methods and events respectively when there's a conflict with a newly generated property