Add favicons
Merge branch 'master' of github.com:grunskis/groupie

Conflicts:
	groupie/app/templates/voting.html