before merge
Merge branch 'dev' of https://github.com/TrinkYet/forum into dev
all work done