updated time sleep
Merge branch 'master' of https://github.com/asgpng/COS-iw
user upload
helper methods update
Merge branch 'master' of https://github.com/asgpng/COS-iw

Conflicts:
	app/helper_methods.py
	iw.py