filter fix + fancybox
Merge remote-tracking branch 'lp/master'

Conflicts:
	frontend/web/app/collections/markers.js
fancybox
Merge remote-tracking branch 'lp/master'

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

fancybox