login
Merge branch 'master' of https://github.com/userdev/meet

Conflicts:
	application/config/config.php
	application/controllers/user.php

Signed-off-by: userdev <puisis14@gmail.com>