update 29/01
Merge branch 'master' of https://github.com/BowlMinions/Twistos_Lolla

Conflicts:
	site/app/View/Elements/footer.ctp