Show proper header message for user and admin.
Merge pull request #61 from crowdint/manage_admins_area

Manage admins area
Merge branch 'master' into show_proper_header

Conflicts:
	app/assets/javascripts/kiitos/user_dashboard.js.coffee
Merge pull request #62 from crowdint/show_proper_header

Show proper header message for user and admin.
Merge pull request #63 from crowdint/manage_kiitos_area

Manage kiitos area
Bump version
Refactor kiitos_controller
- Create before_filter find_kiito for only edit and update actions
Merge branch 'master' into refactor_kiitos_controller
Update Gemfile.lock with the version bump
Merge pull request #67 from crowdint/refactor_kiitos_controller

Refactor kiitos controller
Merge branch 'master' into manage_kiitos_area