Merge v0.6.20 into swig support
Merge branch 'feature-swig-templating-support'

* feature-swig-templating-support:
  Merge v0.6.20 into swig support
update version number for cpb
Avoid mixin pollution

Conflicts:
	lib/template/engines/ejs.js
Prevent mixin pollution
Only copy over controller properties, no functions

Conflicts:
	lib/controller/base_controller.js
update version to include mixin fixes for template rendering