- add load message
- fixed bugs messages for admin & user
Merge remote-tracking branch 'origin/master'