avatar na sidebar
Merge branch 'master' of https://github.com/bactac/combini

Conflicts:
	www/js/controllers.js
funciona menos o mandar porra