Merge branch 'master' of github.com:VirtualViper1/Everything-Forum

Conflicts:
	The Everything Forums.xcodeproj/project.pbxproj
Merge branch 'master' of github.com:VirtualViper1/Everything-Forum

Conflicts:
	Sources/Admin/database.php
	Sources/Admin/threat_log.txt