changez
Merge branch 'development' of github.com:alonerage/lunatour into development

Conflicts:
	app/views/about/contacts.html.haml
mmm
Merge branch 'development' of github.com:alonerage/lunatour into development

mmm