Adding Event controller and Views and angular code
merge