a lot of changes
Merge branch 'master' of github.com:happn/crossplatform

Conflicts:
	.gitignore