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

Conflicts:
	.DS_Store
	everythingforum.xcodeproj/project.xcworkspace/xcuserdata/ryank3egan.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of github.com:VirtualViper1/Everything-Forum

Conflicts:
	Sources/Admin/database.php