upload page changes (finished with the video upload)

Needs further testing
upload page modifications

finished with the video upload, needs further testing
Merge branch 'master' of https://github.com/Motivable/motivable

Conflicts:
	media/js/main.js