Started on upload form - added route to app
Fixed problem caused by loading preprocessor in partridge __init__.py
Making improvements to upload view
Merge branch 'feature/uploadform' into develop

Conflicts:
	partridge/templates/mainpage.html
Merge branch 'develop' into feature/preprocessor