Change in User Model References

Change in User Model References
13/11/2013
Merge branch 'master' of https://github.com/nandel/ProjetoLocais

Conflicts:
	projeto/static/default/css/melhordemacacos.css