Update hall codes
Update meal booking URL to use https again
Merge branch 'master' into experimental

Conflicts:
	src/com/joebateson/CaiusHall/DisplayHallInfoActivity.java