Added support for authorizing with x-forwarded-for ip. Fixed issues with project.
Resolved conflicts
Fixed crust options and refactored erb