include ember-model
pagination (WIP)

#11
Merge branch 'master' of https://github.com/aaronshaf/canvas-modules

Conflicts:
	app/models/module.coffee
	app/models/module_item.coffee
	app/views/modules_view.coffee