Cust app 2.5
Merge branch 'master' of github.com:rasmusgraver/NewSnapporder

Conflicts:
	android/index.html