Fix user from getting into other account
Add buttons to home after login
Allow information editing rather than creating one
implement working UI for information
add people to user model
Fix UI construct for skills
Some other changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/skills_controller.rb
changes to make resume work further