update
Merge branch 'master' of https://github.com/wingart/nadivane

Conflicts:
	main_blocks/footer.php