adjusting the structure so it makes more sense
Merge branch 'refs/heads/kohana_v3.3/fix/pswrd_change_email' into kohana_v3.3/master