added travis-ci
Merge pull request #1 from FityFity/adding_travis-ci

added travis-ci
changed test data
Merge remote-tracking branch 'upstream/master'
excluded PyCharm IDE files
Check that a user has enough permissions for the resources that they are creating usergroups for
Revert "added travis-ci"

This reverts commit df14c351dd6a645b025ea3b44047571e40ae8bf0.

Conflicts:
	tests.py
Merge branch 'ac4ac' of https://github.com/FityFity/lda-siteserver
code review with Mark
Merge branch 'master' of https://github.com/ld4apps/lda-siteserver
Merge branch 'master' of https://github.com/ld4apps/lda-siteserver
bug fixes

1) Simple typo of variable name.
2) Permissions was assuming all resources were of type UserGroup.
Changed it to call super when this wasn't the case.  Also some documents
were coming in as RDF docs and some were coming in as dicts.  I added a
check to convert dicts to RDF docs.  Perhaps this isn't correct though
as it's due to a bug somewhere else?
fixed a couple of bugs in ac permissions logic
Set user in headers, returned permissions after check

1) intra_system_get doesn't seem to set the cookie for the current user
(they show as anonymous on the other side of the get.
2) if the user had permissions on all resources we were their
permissions on ac which isn't right.  I changed it to return full
permissions.
Merge remote-tracking branch 'upstream/master' into ac4ac
Merge branch 'master' of https://github.com/ld4apps/lda-siteserver
Merge branch 'master' of https://github.com/ld4apps/lda-siteserver
Merge branch 'ac4ac' of https://github.com/FityFity/lda-siteserver
use self.intra_system, not utils.intra_system