changed local ip
fixed conflict
fixed conflicts
Merge branch 'master' of github.com:kira-io/kira_rails
Fixed conflicts
Merge branch 'master' of github.com:kira-io/kira_rails
Merge branch 'master' of github.com:kira-io/kira_rails
Added injectors