pagination first version + package disambiguation
assembly xml
Merge branch 'master' of https://github.com/LSIR/Monadikos

Conflicts:
	schema-manager/conf/monadikosSchema_test.ddl
	schema-manager/src/main/assembly/release.xml
	schema-manager/src/main/java/ch/epfl/lsir/monadikos/schemamanager/facebook/FacebookEntityMgr.java
	schema-manager/src/main/java/ch/epfl/lsir/monadikos/schemamanager/instagram/IInstagramEntityMgr.java
	schema-manager/src/main/java/ch/epfl/lsir/monadikos/schemamanager/instagram/InstagramEntityMgr.java
	schema-manager/src/main/java/ch/epfl/lsir/monadikos/schemamanager/mappers/InstagramMapper.java
	schema-manager/src/main/java/ch/epfl/lsir/monadikos/schemamanager/mappers/TwitterMapper.java
	schema-manager/src/main/java/ch/epfl/lsir/monadikos/schemamanager/twitter/TwitterEntityMgr.java
	schema-manager/src/main/java/ch/epfl/lsir/monadikos/schemamanager/utilities/SchemaConsts.java
	schema-manager/src/test/java/ch/epfl/lsir/monadikos/schemamanager/tests/AddRetrieveTwitterEntryTest.java