Merge branch 'master' of https://github.com/pugovok/lostpets
Merge branch 'master' of https://github.com/pugovok/lostpets
filter fix + fancybox
Merge branch 'master' of https://github.com/pugovok/lostpets
Merge remote-tracking branch 'lp/master'

Conflicts:
	frontend/web/app/collections/markers.js
Merge branch 'master' of https://github.com/pugovok/lostpets
Merge pull request #40 from ilya3d/master

map and center
fancybox
Merge remote-tracking branch 'lp/master'

Conflicts:
	frontend/web/app/views/map.js
Merge pull request #41 from iamkuper/master

fancybox
Merge pull request #42 from ilya3d/master

map resize
fix
Merge remote-tracking branch 'origin/master'
change html grid
Merge branch 'master' of https://github.com/pugovok/lostpets
Merge pull request #43 from ArmiT/master

html grid changed