Merge branch 'master' of git://github.com/newicon/nii-core
Fix for PDF downloads
Allow dash in username (valid character)
Merge branch 'CB_user_changes'

Conflicts:
	modules/user/UserModule.php
	modules/user/models/User.php