Image upload
Merge branch 'Robin'

Conflicts:
	application/views/login_template.php