download update
Merge branch 'master' of https://github.com/lgrassini/205.git

Conflicts:
	application/views/scripts/software/download.phtml