Fix datasources pagination
Bump version
Merge branch 'hotfix/0.6.11' into develop

Conflicts:
	bower.json
Debump