smashed a banana on my keyboard
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/PictureReference.php