Fixed gitignore, check file size on client side
Merge branch 'master' into aws