cleaning up code
Merge branch 'master' of https://github.com/ctaira/mobdeep

Conflicts:
	packages/events/public/controllers/events.js