Ignore du cache cmake
Merge branch 'master' of github.com:Jokahero/Qawale-core

Conflicts:
	.gitignore