wip-Development

i had to create a new PR. i think when i was updating my heroku account i pushed to the wrong remote so it looks like all of the 'previous' development branch was merged into master.
add the proper escaping for emails (rsplit on @ into two parts, escape left part by url encoding it, concatenate the parts back together with an @)