feature f3 complete
release change included
Merge branch 'release/v1.2' into develop

* release/v1.2:
  release change included

Conflicts: resolved
	app/controllers/application_controller.rb