#113 #114
Merge pull request #125 from rhsu/DBmaintenance

#113 #114
Merge branch 'master' into login