add skills to available users

[#77436688]
fix to_formatted_s bug

[#77273016]
fix current_active bug

now current_active returns even if membership has no ending date
Merge pull request #13 from Ragnarson/separate_admins

Separated the administrator from users
Revert "Separated the administrator from users"
Merge pull request #21 from netguru/revert-13-separate_admins

Revert "Separated the administrator from users"
Revert "Merge pull request #21 from netguru/revert-13-separate_admins"

This reverts commit 488cd9c6e76d6b9185d615f8d14eecfc9c219165, reversing
changes made to 9974d944c8fd093cb685269108f0c5928fd91850.
Fix specs
8b47990ae1e172e3ac2c4878bd55115f1dc1967f fix
Merge branch 'github_auth' of github.com:Ragnarson/people into Ragnarson-github_auth

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/projects/_form.html.haml
	spec/spec_helper.rb
Specify project type in form [#18]
Merge branch 'Ragnarson-github_auth'
Merge branch 'master' of github.com:netguru/people
add carrier wave and mini_magick

[#77701196]
generate icon uploader

[#77701196]
update templates - needs styling though

[#77701196]
Merge branch 'add_vacations' of github.com:Ragnarson/people into Ragnarson-add_vacations

Conflicts:
	Gemfile
	app/views/available_users/index.html.haml
	spec/features/teams_spec.rb
	spec/spec_helper.rb
fix gemfile.lock conflict
Merge branch 'master' of github.com:netguru/people
Added vacation checker