pull changes
changes in plans design
Merge branch 'master' of github.com:railskipl/meritize
changes in forgot password form
plan selection syntax changed
changes in passowrd reset edit
conflicts removed
pull changes
Merge branch 'master' of github.com:railskipl/meritize
plan index page changed
jquery.js refrenced in admin_user page
working on general setting module
working on general setting module
changes in view page
changes in admin setting module