Merge branch 'tracker' of https://github.com/vsalgado/Bycler into sidebarplus

Conflicts:
	client/stylesheets/bycler_base.css
	client/views/googleMap/googleMapInner.js
Cambio credenciales fb
Merge branch 'master' into sidebarplus
Merge branch 'sidebarplus'

Conflicts:
	client/stylesheets/bycler_base.css