older changes from yesterday.
Merge branch 'master' of https://github.com/rhysl/parttimemaidorg

Conflicts:
controllers/home.php
library/session.php
Merge branch 'master' of https://github.com/rhysl/parttimemaidorg

Conflicts:
	controllers/home.php
	library/session.php