baseStations are marked on google map
Merge branch 'master' of https://github.com/r3dDoX/fliBeacons

Conflicts:
	node/fliBeacons/public/javascripts/client.js
	node/fliBeacons/views/layout.jade
fixed filter
Merge remote-tracking branch 'origin/master'