Show temporary page for users not yet approved. refs #1062
Merge branch 'master' into branch-v2-feature1062
Improve pending approval page's layout and strings

refs #1062
Tests for the new approval page in #42

refs #1062
Organize all features for Site flags in a folder
Fixing travis
Setting up a database before travis does tests
Small change in apache's config file for apache 2.4

As recommended by passenger.
Merge branch 'master' into branch-v2-feature1062
Remove notification from pending approval page, the page has the msg

refs #1062
Show pending approval page for login via shibboleth too

refs #1062
Show pending approval page for login via ldap

refs #1062
Fix and test Devise::Strategies::LdapAuthenticatable

refs #1062
Merge pull request #42 from mconf/branch-v2-feature1062

Show a temporary page for users not yet approved
refs #1062
Update datetimepicker and fix momentjs hanging. refs #1374
Random dates for recent activities on db:populate

Also improved the dates a bit in general in this task and fixed a possible
error during execution.
Correct problem sending event invitations
Fix permissions for users in conferences

The order of the methods to load the room, fetch information and check
permissions was not exactly right. It was also loading the room in multiple
places and fetching the information into one variable, but checking the
permissions using another.

Added a few more tests to try to make sure that things run in the order they
should and using the right variables.

refs #1376
Correctly call mailers error_handler. refs #1365
Merge branch 'master' into bug1365