quail image
Merge branch 'dev' of https://github.com/travaasa/travaasa2_0 into dev

Conflicts:
	newsletter/2013/december/images/story4.jpg
kamaaina update
Edits to seasonal treatments +

also corrected M dashes in prices (and made consistent) and removed .00
in prices.
jam jive banner
Merge branch 'dev'