mobile
Merge branch 'master' of git@github.com:michelluther/stayOver.git

Conflicts:
	stayOver/application/config/autoload.php
	stayOver/application/controllers/so_base_controller.php
	stayOver/application/views/content/include/assigned_children.php
	stayOver/application/views/content/settings.php
	stayOver/application/views/header.php
	stayOver/css/mpm.css