Merge branch 'minimal' into swig
Merge branch 'minimal' into rest
Redirect controller added (plus minor fixes)
Merge branch 'minimal' into rest
Merge branch 'minimal' into swig

Conflicts:
	lib/controller/index.js
Merge branch 'swig'
Merge branch 'rest'