Fixed bug #221 user API inconsistencies with data model
Bug #221: update only API until arrangement
Resources rename dflt_sliver and max_sliver to dflt_req max_req
Minor improvements on username handling
Merge branch 'django1.6' of git.confine-project.eu:confine/controller into local
Updated dependencies for django 1.6
Merge branch 'local' into django1.6
depend on kombu 2.5.14 because of strange import errors