Merge branch 'master' into georgiana

y
fixed jinja bug
merge
stuff
favicon and email
database email
favicon added to all pages
testing edit profile
merged with master