Commit Init
Merge branch 'master' of https://github.com/boskiv/FileUploaderModule

Conflicts:
	.gitignore