Merge pull request #6 from alandarold/master

Update of classes and upload of videos
commited to fucker project
ASJDH UYDHAS
Merge branch 'master' of https://github.com/Unisep/peneira

Conflicts:
	.classpath
	WebContent/template.xhtml
	src/br/com/peneira/bean/upload/Upload.java
	src/com/peneira/logon/Logon.java
	target/m2e-wtp/web-resources/META-INF/maven/br.edu.unisep.peneira/Peneira/pom.properties