Dummy commit
Minor changes.
Changed the way we load users.
Merge branch 'kostas'