Fixed Registration & changed Navigation
Merge remote-tracking branch 'origin/master'

Conflicts:
	packages.php