Upload video issue
Merge branch 'newtemplate' of https://github.com/EVRI-TEAM/Evri_Giver-Mobile-App into newtemplate

Conflicts:
	www/js/directives.js