All branch merge 

some link updated
File upload woorking (another file upload remaining)
userdocument database entry remaining