add some redirect links
Merge branch 'feature/136-add-itmozg-logo' into develop
add active class to current menu page
add trackable_to_user migration
add track_user method to auth helper
refactoring track_user method
fix bugs in events controllers and test refactoring
Merge branch 'feature/add_events_crud_and_create_event_page' of https://github.com/kaize/nastachku into feature/add_events_crud_and_create_event_page
rename buttons
Merge branch 'develop' into feature/add_events_crud_and_create_event_page

Conflicts:
	app/views/layouts/web/shared/_navigation.html.haml
Merge branch 'feature/add_events_crud_and_create_event_page' into staging