'p' for password and 'u' for username ;-)
Protect against special characters in password
Merge branch 'master' into install_defaults

Conflicts:
	examples/usr/local/bin/occi_smoketest
Another fix for safer passwords
Merge branch 'master' into install_defaults
Merge pull request #6 from sustr4/install_defaults

Install defaults