! Fixed the upgrade.php failing when the Themes directory was in a directory other than $boarddir [commit 11004]

Signed-off-by: emanuele <emanuele45@gmail.com>

Conflicts:

	install/upgrade.php
Merge branch 'upgrade'

Conflicts:
	install/upgrade.php
Small issue with previous commit

Signed-off-by: emanuele <emanuele45@gmail.com>
Merge pull request #100 from emanuele45/master

upgrade and themes