adding number to the tabs for the wizard
Merge pull request #35 from LaunchPadLab/adding_number_to_wizard

adding number to the tabs for the wizard
Merge branch 'tukaiz' of https://github.com/LaunchPadLab/engine into tukaiz-staging
stashing for later
permissions for portal users
updated ability.rb
fixed ability file to work with import users and events
Merge branch 'ability-fixes' of https://github.com/LaunchPadLab/engine into ability-fixes
merged
Merge pull request #37 from LaunchPadLab/ability-fixes

Ability fixes
adding menu cell for lyris back
adding code back for lyris
Merge pull request #39 from LaunchPadLab/enabling_lyris_link

Enabling lyris link
Merge branch 'tukaiz-staging' of https://github.com/LaunchPadLab/engine into lyris_phase_1.1
portal nav takes into account 'all' user type
Merge pull request #40 from LaunchPadLab/portal-nav-fix

portal nav takes into account 'all' user type
portal users for a site == site portal users + super admin portal users
Merge pull request #41 from LaunchPadLab/tukaiz-portal-users

portal users for a site == site portal users + super admin portal users
Merge branch 'tukaiz-staging' of https://github.com/LaunchPadLab/engine into lyris_phase_1.1
preventing portal users from loggin into other schools' portals