Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/c_auth.php
	application/views/my_file.html
	application/views/pages/vehicles/index.php
	css/styles.css
	js/js_libraries.js
Unstaged
Merge remote