fix bug 47949681
Merge remote-tracking branch 'vmw-tmpst/master' into fix-file-uploader
Merge pull request #194 from whywhy36/fix-file-uploader

Fix file uploader
Merge branch 'master' of https://github.com/vmw-tmpst/heroapp-LetsHire into interview

Signed-off-by: Henry Chen <hchen@vmware.com>

Conflicts:
	app/assets/javascripts/candidates.js