* Fixed navigation menu in software detail
Merge branches 'master' and 'master' of https://github.com/lgrassini/205

Conflicts:
	application/layouts/scripts/software.phtml