add UserHelper
login integ test and module improvements
resolve conflicts in database.yml