changed db configure, login working
finshed some report
finish all reports and reminder
Fixed merge conflicts