Added temporary data model and fixed favicon.png not displaying
Merge remote-tracking branch 'origin/master'

Conflicts:
	beevote/main.pyc
Conflict generated because two different main.pyc files were compiled
while offilne