emailing
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

Conflicts:
	application/modules/admin/controllers/admin.php
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop

Conflicts:
	application/modules/admin/controllers/admin.php
Midnight craze
staff on working
Merge branch 'develop' of https://github.com/karsanrichard/southern_cross into develop
trial and error
Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

Conflicts:
	application/modules/users/controllers/users.php
	application/modules/users/models/m_user.php

and more changes on the staff part
Merge branch 'develop' of https://github.com/bakasajoshua/southern_cross into develop

Conflicts:
	assets/js/home.js