iosv1
Merge branch 'master' of https://github.com/SLUGG/homeinspiration

Conflicts:
	assets/www/config.xml