Merge branch 'master' of https://github.com/sumarokov/anotherworld

Conflicts:
	sites/all/themes/anotherworlds/anotherworlds.info
	sites/all/themes/anotherworlds/template.php
Merge branch 'master' of https://github.com/sumarokov/anotherworld

Conflicts:
	sites/all/themes/anotherworlds/template.php