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

Conflicts:
	sites/all/modules/aw_photo/aw_photo.module