Updated assets version to get styles back
Fixed merge conflicts in application controller
Updated build your order page with number of frequency/quantity and coffee origin