Merge.
Client file upload up and running.
Minor changes.
Merge branch 'master' of https://github.com/krajj7/pikater