ipad touch
filters and map height
Merge branch 'dev' into production