labels
Merge branch 'master' of https://github.com/joviverheyen/Brainstorm

Conflicts:
	application/models/upload_model.php
	application/models/uploadav_model.php