Added foremanfiles
Merge branch 'master' of https://github.com/MyConference/MyConference-Web

Conflicts:
	.gitignore
Added uploads