Merge branch 'master' into g33k1ns1d3's-l0cal
path fixes for login form and register form
Merge branch 'g33k1ns1d3's-l0cal'