Web/Fix: Removing the Routing System from One. It is not working. It is also causing problems to many members.
Step 1/3

Signed-off-by: FailZorD <alex_pap_2010@live.com>
Web/Fix: Removing the Routing System from One. It is not working. It is also causing problems to many members.

Step 3/3 (Maybe)

Signed-off-by: FailZorD <alex_pap_2010@live.com>
Merge branch 'master' of https://github.com/AquaFlameCMS/AquaFlameCMS_Trinity into ghbb

Conflicts:
	news.php
	panel/promo.php
	panel/sotd.php