Merge origin/master

Conflicts:
	application/views/welcome.php
Merge origin/master

Conflicts:
	application/views/welcome.php
Merge origin/master

Conflicts:
	application/views/welcome.php
Merge origin/master

Conflicts:
	application/logs/log-2014-12-16.php
	application/views/header.php