commit
Merge branch 'origin/master2'

Conflicts:
	application/modules/id/controllers/upload.php
	application/modules/id/views/view_photo.php
	application/views/welcome_message.php
	default.css