test
Merge branch 'master' of https://github.com/koryakinp/AviationProject

Conflicts:
	View/categoryView.php
	View/topicView.php
	auxiliary/DataBase.php
	auxiliary/Display.php
	forum.php
test
test