Fixed drink page bug & bug where pages need to be refreshed to show info
Merge commit '11717dcdc3b722bfcb52e936df41c18a7bbaf427'

Conflicts:
	build/script.min.js