...
Merge branch 'master' of https://github.com/iYottt/museum

Conflicts:
	application/modules/traces/controllers/traces.php