Retiques
Merge branch 'master' of https://github.com/vsalgado/Bycler

Conflicts:
	client/css/component.css
	client/css/simple-sidebar.css
	client/lib/meteor/router.js
	client/views/maps.html
	client/views/simpleLayout/simpleLayout.html
	server/config/accounts.js
Version GitHub estable