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

Conflicts:
	newsletter/2013/december/images/story4.jpg