update Rest library to fix upload bug
remove contentType to fix upload bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/js/main.js