Merge branch 'master' of https://github.com/dhammerberg/OfficeDepot

Conflicts:
	.gitignore