filter
Merge branch 'master' of https://github.com/jtHunter/iw014_storalot

Conflicts:
	www/sdk/loading.js