f4 changes
f5 complete
Merge branch 'feature/f4' into develop

* feature/f4:
  f4 changes

Conflicts: resolved
	app/controllers/application_controller.rb