Merge branch 'feature/twitter' into develop

Conflicts:
	config/routes.js