'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
Updated README, gwdg -> EGI-FCTF
Major version bump to 1.0.0, STABLE
Fixes EGI-FCTF/rOCCI-server#7

Adds location rendering to `text/plain` and `text/occi`. All
resource locations will be rendered as 'X-OCCI-Location' or
'Location' depending on the MIME type. This fixes compatibility
issues.
Merge pull request #8 from arax/plain_text_location_fix

Fixes EGI-FCTF/rOCCI-server#7
Fixed routing for *_tpl controllers

Dangling slashes were causing routing mistakes on *_tpl controllers.
Some requests were mistakenly routed as generic mixins, e.g.:

GET /mixin/os_tpl/debian6/  ->  MixinController

instead of

GET /mixin/os_tpl/debian6/  ->  OsTplController
Merge pull request #9 from arax/tpl_routing_fix

Fixed routing for *_tpl controllers
Minor version bump to 1.0.1
Dep updates, fixes EGI-FCTF/rOCCI-server#10
Merge pull request #11 from arax/dep_updates

Updated dependencies
Minor version bump to 1.0.2
Disabled JSON support for security reasons
Minor dep updates
Commented-out JSON-related unit tests
Updated Travis-CI config