jQuery update
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	application/views/_templates/header.php
jQuery update