Update agoradb schema
Fixes leftovers from merge conflict
Merge pull request #2 from skanct/fix-gitignore

Fixes leftovers from merge conflict
Adds support for travis-ci
Merge pull request #3 from skanct/add-support-for-travis-ci

Adds support for travis-ci
Update schema with compliance profiles
Update schema with compliance profiles
Update schema with compliance profiles
start sails.js model
Merge pull request #5 from louridas/master

start sails.js model
Update compliancePrfofiles. Added country collection.
Merge branch 'master' of https://github.com/grnet/agora
Merge remote-tracking branch 'upstream/master'

Conflicts:
	docs/schema/agoradb.json
Merged all