reomved .pro.user files
Merge branch 'master' of https://github.com/bcace/ochre

Conflicts:
	ochre/ochre.pro.user
	ochrebox/ochrebox.pro.user