Changed pip syntax for Django installation
Merge remote-tracking branch 'origin/master'

Conflicts:
	requirements.txt
Added "six" to requirements and API documentation
Added support for file upload and make few other parameters dynamic