improve waste and factory functionality
add factories and active factories limits
add minor improvement to active factory calculation
merged and fixed conflict
merged and solved conflict
Merge pull request #3 from yehppael/master

Update waste functionality with limits on total factories and active factories production