.idea to gitignore
Merge branch 'develop' of https://github.com/pixelpark/ppnet into develop

Conflicts:
	.gitignore
ppSyncService.cancel() on "Destroy"
Merge branch 'develop'