more mixins
Merge branch 'master' of https://github.com/g00fy-/marionette.generic

Conflicts:
	src/mixins.js