Fixed broken app in production
Updated rules engine
Merged master