File uploader
ngix.conf update
Merge branch 'master' of https://github.com/mtimmermann/Contacts.Marionette.App

Conflicts:
	.gitignore