Pull from 'master'

Up to date to Iteration 3
Test event_controller/add_conditional_acceptance
git merge 'master'
test coverage files
Test/Passed event#add_cond_acceptance