updated flask structure
Merge branch 'master' of https://github.com/asgpng/COS-iw

Conflicts:
	iw-python/app/helper_methods.py