removing old files
Merge remote-tracking branch 'origin/master'

Conflicts:
	htdocs/ios_app/index.html