finish refactor
Merge branch 'refactor'

Conflicts:
	app/js/Features.js