change resolution for iPad only; add stage-object; change popUp-size
Merge branch 'master' of https://github.com/elcolto/BerPhilApp

Conflicts:
	index.html