Merge branch 'master' of git://github.com/joacub/zf-joacub-uploader-twb

Signed-off-by: Johan <joacub@gmail.com>

Conflicts:
	vendor/jQuery-File-Upload