resetting password stuff
added flashes
fix merge
fix js
copy some stuff from master variant to new variant
fix merge
added ga code to general settings