pull changes
Merge branch 'master' of github.com:railskipl/meritize
plan selection syntax changed
changes in passowrd reset edit
conflicts removed