fixed event thing

Conflicts:
	mean-master/app/controllers/core.server.controller.js
	mean-master/app/routes/core.server.routes.js
	mean-master/public/modules/core/views/home.client.view.html