Fix video upload bug alert dialog
Update my folder
Merge origin/master

Conflicts:
	Phaidra/pom.xml
Insert horizontal anda vertical scrollbar into Jtree module