Add Gemfile.lock with updated Gem dependecies
Fix bug were addon with different tier didn't overlap each other
Update specs and gems for development/testing