fix trello bugs
Merge remote-tracking branch 'origin/development' into jeh_branch

Conflicts:
	application/controllers/welcome.php