Adding bugs fixing
Fixing bugs
Merge branch 'feature/alpha' into staging

Conflicts:
	app/controllers/web/works_controller.rb